gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
parent d7964f40d7 b0cfc9769a
commit 3425323bb4
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.
#