From 00355ec6f759cda09ce63b1495714c84eb460d9c Mon Sep 17 00:00:00 2001 From: Julian Prein Date: Thu, 3 Feb 2022 18:17:27 +0100 Subject: [PATCH] git: Enable `rerere` Activate recording of resolved conflicts, so that identical conflict hunks can be resolved automatically, should they be encountered again. --- .config/git/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/git/config b/.config/git/config index dd28b9f..a5ded12 100644 --- a/.config/git/config +++ b/.config/git/config @@ -41,6 +41,8 @@ default = current [rebase] autostash = true +[rerere] + enabled = true [status] submodulesummary = true [user]