movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Introduce script to automatically resolve conflicts after treewide changes (such as reformats) (#363759)

Browse source
This commit is contained in:
Janne Heß 2025-01-21 20:47:57 +01:00 • committed by GitHub
commit 3425323bb4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 263 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.git-blame-ignore-revs
View file

@ -1,5 +1,11 @@
# This file contains a list of commits that are not likely what you
# are looking for in a blame, such as mass reformatting or renaming.
#
# If a commit's line ends with `# !autorebase <command>`,
# where <command> is an idempotent bash command that reapplies the changes from the commit,
# the `maintainers/scripts/auto-rebase/run.sh` script can be used to rebase
# across that commit while automatically resolving merge conflicts caused by the commit.
#
# You can set this file as a default ignore file for blame by running
# the following command.
#