tobias/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-11-09 16:18:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
nixpkgs/maintainers/scripts/auto-rebase
History
Silvan Mosberger d1a4769b38 treewide: nixfmt-rfc-style -> nixfmt 
Except:
- Instances in documentation, because people in older versions
  can't switch to nixfmt yet due to it having pointed to nixfmt-classic
  before
- In code that runs based on a CI Nixpkgs version, which is also a bit
  older still
- In update script shebangs, because many of them don't pin Nixpkgs, and run
  with whatever is in NIX_PATH (and it's not easy to fix this, see
  https://github.com/NixOS/nixpkgs/issues/425551)
2025-07-15 22:14:18 +02:00
..
test treewide: nixfmt-rfc-style -> nixfmt 2025-07-15 22:14:18 +02:00
README.md
run.sh

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