From 565df7259702cda7af3a3de94c067b27368249d0 Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Mon, 30 Jan 2023 13:46:13 +0100 Subject: [PATCH] Git config fixes --- git/.config/git/config | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/git/.config/git/config b/git/.config/git/config index 9f0dacd..827c5ad 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -41,6 +41,7 @@ pushf = push --force-with-lease fixup = commit --fixup=@ master = !git fetch && git checkout -B master origin/master + del = branch -D [rebase] autosquash = true @@ -57,8 +58,14 @@ [blame] # Ignore certain commits while generating "git blame." Filename taken from # Github's pseudo-standard - ignoreRevsFile = .git-blame-ignore-revs - # Mark any lines that have had a commit skipped using --ignore-rev with a `?` + # + # 2023-01-26: Enabling this by default causes blame to fail in all repos + # that do not have it. Not desirable behaviour. Should be manually enabled + # per-repo. + # + # ignoreRevsFile = .git-blame-ignore-revs Mark any lines that have had a + # commit skipped using --ignore-rev with a `?` markIgnoredLines = true - # Mark any lines that were added in a skipped commit and can not be attributed with a `*` + # Mark any lines that were added in a skipped commit and can not be + # attributed with a `*` markUnblamableLines = true