diff options
| -rw-r--r-- | git/gitconfig | 8 |
1 files changed, 8 insertions, 0 deletions
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/ |