gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

**/README.md: one sentence per line

Browse Source 
As documented in doc/README.md.
This commit is contained in:
Wolfgang Walther
2025-06-29 18:33:08 +02:00
parent 2369d96548
commit b4532efe93
13 changed files with 392 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
maintainers/scripts/auto-rebase/README.md
View File

@@ -1,7 +1,6 @@
# Auto rebase script
The [`./run.sh` script](./run.sh) in this directory rebases the current branch onto a target branch,
while automatically resolving merge conflicts caused by marked commits in [`.git-blame-ignore-revs`](../../../.git-blame-ignore-revs).
The [`./run.sh` script](./run.sh) in this directory rebases the current branch onto a target branch, while automatically resolving merge conflicts caused by marked commits in [`.git-blame-ignore-revs`](../../../.git-blame-ignore-revs).
See the header comment of that file to understand how to mark commits.
This is convenient for resolving merge conflicts for pull requests after e.g. treewide reformats.