Skip to content

Commit 468ccf8

Browse files
authored
Add .git-blame-ignore-revs (#13884)
* Add .git-blame-ignore-revs * Fix .git-blame-ignore-revs * Fix linting issue
1 parent 6a04ce3 commit 468ccf8

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

.git-blame-ignore-revs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Automatic code reformatting
2+
f3cfa496e028dee1cafd0c47553f63cd1243bd8c
23
c5bcad738fe6e8dfcb62442a426c2778241515a1
4+
10189bf2c1a6bc506f03461390f3cc46e5cc0651
5+
16fd6194b9a0b8282259c00b6fb0d4aa494e4b04
36

47
# net.sf.jabref -> org.jabref
58
b2ad6eb279f5def38fa21be12cb5dd4545c1ba1a
@@ -23,6 +26,6 @@ bf81b595a77f0f7f254872be6f05a063c44528d8
2326

2427
# This commit should not exist
2528
185d7345946c29a2a4e2726c912be0c4db4810b9
26-
# Resulted in this problematic merge commits
29+
# ... and resulted in this problematic merge commits
2730
7e1645978b3028df5e65af19f0f819ddfd0f24aa
2831
a31f396765492ac12eaab228e33eb9d22487403b

docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-03-code.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,13 @@ origin https://github.com/YOURUSERNAME/jabref.git (push)
8484
upstream https://github.com/JabRef/jabref.git (fetch)
8585
upstream https://github.com/JabRef/jabref.git (push)
8686
```
87+
88+
## Have `git blame` working
89+
90+
You need to tell git to ignore some commits when doing `git blame`:
91+
92+
```terminal
93+
git config --global blame.ignoreRevsFile .git-blame-ignore-revs
94+
```
95+
96+
<!-- background: https://docs.github.com/en/repositories/working-with-files/using-files/viewing-and-understanding-files#ignore-commits-in-the-blame-view -->

0 commit comments

Comments
 (0)