dotfiles

commit aae842d4d8fb25f2a047d8beca4a5a0a3729c2b1
parent 6016ab648dfbfe431aebcfb1fb8655e1f3238ad9
Author: Alex Balgavy <alex@balgavy.eu>
Date:   Sat, 10 Feb 2024 15:27:14 +0100

Add some recommendations from the FOSDEM 2024 talk

https://blog.gitbutler.com/git-tips-and-tricks/

Diffstat:
M
git/gitconfig
 | 
11
+++++++++++

1 file changed, 11 insertions(+), 0 deletions(-)
diff --git a/git/gitconfig b/git/gitconfig
@@ -50,7 +50,9 @@
     sd = stash drop
     sl = stash list
 
+    blame = "blame -w -C -C -C" # ignore whitespace, look for code movement, in multiple commits, for all commits
     diffs = "diff --staged"
+    diffw = "diff --word-diff"
     changes = diff --summary --stat
     changess = changes --staged
     mergetest = merge --no-commit
@@ -112,3 +114,12 @@
     required = true
 [init]
 	defaultBranch = master
+
+[rerere]
+        # remember how I solved a merge conflict and reuse it
+	enabled = true
+	# automatically stage the reuse
+	autoUpdate = true
+# Use ssh key to sign commits
+[gpg]
+	format = ssh