c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity
nixpkgs/maintainers/scripts/auto-rebase
History
Exact
Maximilian Bosch b5f59f805b
 auto-rebase: add -f to the filter-branch invocation 
...because it tells me to do so:

    + git filter-branch --parent-filter 'sed '\''s/2140bf39e41767f25a395d20fb0d5698b8934b33/374e6bcc403e02a35e07b650463c01a52b13a7c8/'\''' --tree-filter 'nix-shell --run treefmt' 374e6bcc403e02a35e07b650463c01a52b13a7c8..HEAD
    Cannot create a new backup.
    A previous backup already exists in refs/original/
    Force overwriting the backup with -f
2025-08-10 14:24:34 +02:00
..
test treewide: nixfmt-rfc-style -> nixfmt 2025-07-15 22:14:18 +02:00
README.md
run.sh auto-rebase: add -f to the filter-branch invocation 2025-08-10 14:24:34 +02:00

README.md

Auto rebase script

The ./run.sh script 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. 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.

Testing

To run the tests in the test directory:

$ cd test
$ nix-shell
nix-shell> ./run.sh