diff options
| author | Janne Heß <dasJ@users.noreply.github.com> | 2025-01-21 20:47:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-21 20:47:57 +0100 |
| commit | 3425323bb4c4bbf84fd0a3d2227a74aa0505b858 (patch) | |
| tree | abb8e41e2f10380c98db3e57ab6534b20aba67b5 /.git-blame-ignore-revs | |
| parent | shadow: fix meta.homepage (#375611) (diff) | |
| parent | maintainers/scripts/auto-rebase: init (diff) | |
| download | nixpkgs-3425323bb4c4bbf84fd0a3d2227a74aa0505b858.tar.gz | |
Introduce script to automatically resolve conflicts after treewide changes (such as reformats) (#363759)
Diffstat (limited to '.git-blame-ignore-revs')
| -rw-r--r-- | .git-blame-ignore-revs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 9957db3b8f60..b8aeaadf4141 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -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. # |