dotfiles

commit 1b5608bce804fea9437e7af36f161be0d9b1541e
parent aaf2180eaf5037e05a0e216a56bc603af982e4b0
Author: Chris Bracken <chris@bracken.jp>
Date:   Mon, 22 Apr 2024 13:38:46 -0700

git: enable rerere

During rebase, if you apply a merge fix once, it'll remember the fix and
re-apply if it hits the same conflict again.

See: https://git-scm.com/book/en/v2/Git-Tools-Rerere

Diffstat:
M
.config/git/config
 | 
4
++--
M
.config/git/yanagi
 | 
2
++

2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.config/git/config b/.config/git/config
@@ -29,6 +29,8 @@
   default = simple
 [rebase]
   autosquash = true
+[rerere]
+  enabled = true
 [sendemail]
   smtpserver = smtp.gmail.com
   smtpuser = chris@bracken.jp
@@ -38,8 +40,6 @@
 [user]
   name = Chris Bracken
   email = chris@bracken.jp
-[http]
-  cookiefile = ~/.gitcookies
 
 # If a host-local config file is present, merge it into our config.
 [include]
diff --git a/.config/git/yanagi b/.config/git/yanagi
@@ -4,3 +4,5 @@
   program = gpg
 [user]
   signingkey = 9EF6957AF673652E4AB5542DBBE45868CBE8A8FE
+[http]
+  cookiefile = /Users/cbracken/.gitcookies