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