From f25d78defbbf8b195e5aa1494dbd5888c9c08c18 Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Fri, 16 Feb 2024 23:01:25 +0100 Subject: git: some new settings inspired by https://jvns.ca/blog/2024/02/16/popular-git-config-options/ --- git/gitconfig | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'git') diff --git a/git/gitconfig b/git/gitconfig index 5bf85f8..cedf8fb 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -44,6 +44,14 @@ [merge] autoStash = true + conflictStyle = zdiff3 + +[rebase] + autoStash = true + autoSquash = true + +[rerere] + enabled = true [url "git@salsa.debian.org:"] pushInsteadOf = https://salsa.debian.org/ -- cgit v1.2.3