From a4e10ab65b59c4314a2b06eaff6d0f5af60a49f1 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Tue, 25 Jun 2024 17:55:14 -0700 Subject: [PATCH] Enable git rerere For merge conflict resolution replay. Very convenient! --- src/.gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/.gitconfig b/src/.gitconfig index 0ede293..f12b589 100644 --- a/src/.gitconfig +++ b/src/.gitconfig @@ -94,6 +94,8 @@ fetch = +refs/notes/*:refs/notes/* [remote.upstream] fetch = +refs/notes/*:refs/notes/* +[rerere] + enabled = true [status] submodulesummary = true [submodule]