From c5e6591d7fc3cfd8d64daa988c429bb226d5abd6 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <jim@krystal.io>
Date: Mon, 14 Jul 2025 11:55:45 +0100
Subject: [PATCH] feat(gitconfig): enable rerere

---
 gitconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gitconfig b/gitconfig
index 381d410..3980f12 100644
--- a/gitconfig
+++ b/gitconfig
@@ -17,6 +17,10 @@
 	whitespace = nowarn
 [push]
 	default = simple
+[pull]
+	rebase = true
+[rerere]
+	enabled = true
 [alias]
 	a = add
 	ai = add -i
@@ -40,8 +44,6 @@
 	pgp-on = config commit.gpgsign true
 	pgp-off = config commit.gpgsign false
 	tree = log --all --graph --decorate --oneline --simplify-by-decoration
-[pull]
-	rebase = true
 [difftool "Kaleidoscope"]
 	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 [difftool]
@@ -72,10 +74,8 @@
 [gitlab]
 	user = jimeh
 [credential "https://github.com"]
-	helper =
 	helper = !op plugin run -- gh auth git-credential
 [credential "https://gist.github.com"]
-	helper =
 	helper = !op plugin run -- gh auth git-credential
 [merge "mergiraf"]
 	name = mergiraf