##// END OF EJS Templates
Merge pull request #12277 from ivanov/test-blame-ignore
Matthias Bussonnier -
r25685:e1082955 merge
parent child Browse files
Show More
@@ -1,14 +1,15
1 # When making commits that are strictly formatting/style changes, add the
1 # When making commits that are strictly formatting/style changes, add the
2 # commit hash here, so git blame can ignore the change. See docs for more
2 # commit hash here, so git blame can ignore the change. See docs for more
3 # details:
3 # details:
4 # https://git-scm.com/docs/git-config#Documentation/git-config.txt-blameignoreRevsFile
4 # https://git-scm.com/docs/git-config#Documentation/git-config.txt-blameignoreRevsFile
5 #
5 #
6 #
6 #
7 # You should be able to execute either
7 # You should be able to execute either
8 # ./tools/configure-git-blame-ignore-revs.bat or
8 # ./tools/configure-git-blame-ignore-revs.bat or
9 # ./tools/configure-git-blame-ignore-revs.sh
9 # ./tools/configure-git-blame-ignore-revs.sh
10 #
10 #
11 # Example entries:
11 # Example entries:
12 #
12 #
13 # <full commit hash> # initial black-format
13 # <full commit hash> # initial black-format
14 # <full commit hash> # rename something internal
14 # <full commit hash> # rename something internal
15 6e748726282d1acb9a4f9f264ee679c474c4b8f5 # Apply pygrade --36plus on IPython/core/tests/test_inputtransformer.py.
@@ -1,10 +1,11
1 #!/bin/sh
1 # Other config options for blame are markUnblamables and markIgnoredLines.
2 # Other config options for blame are markUnblamables and markIgnoredLines.
2 # See docs for more details:
3 # See docs for more details:
3 # https://git-scm.com/docs/git-config#Documentation/git-config.txt-blameignoreRevsFile
4 # https://git-scm.com/docs/git-config#Documentation/git-config.txt-blameignoreRevsFile
4
5
5 # Uncomment below and rerun script to enable an option.
6 # Uncomment below and rerun script to enable an option.
6 # git config blame.markIgnoredLines
7 # git config blame.markIgnoredLines
7 # git config blame.markUnblamables
8 # git config blame.markUnblamables
8
9
9 git config blame.ignoreRevsFile .git-blame-ignore-revs
10 git config blame.ignoreRevsFile .git-blame-ignore-revs
10 git config --get blame.ignoreRevsFile
11 git config --get blame.ignoreRevsFile
General Comments 0
You need to be logged in to leave comments. Login now