From 9edb5d124fa235c4130ba670d5f1ca6e956aed68 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Fri, 15 Mar 2024 18:35:28 +0100 Subject: [PATCH] Have to test those new fancy things. --- .config/git/config | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.config/git/config b/.config/git/config index 6462c0c..ed52763 100644 --- a/.config/git/config +++ b/.config/git/config @@ -12,9 +12,15 @@ [commit] gpgsign = true +[rerere] + enabled = true + [pull] ff = only +[diff] + algorithm = histogram + [alias] ap = add -p b = branch @@ -36,7 +42,9 @@ [merge "po3way"] name = po file merge driver driver = po3way --debug --git-merge-driver -- %A %O %B + [branch] sort = -committerdate + [column] ui = auto