diff options
| author | Reiner Herrmann <reiner@reiner-h.de> | 2024-02-16 23:01:25 +0100 |
|---|---|---|
| committer | Reiner Herrmann <reiner@reiner-h.de> | 2024-02-16 23:01:25 +0100 |
| commit | f25d78defbbf8b195e5aa1494dbd5888c9c08c18 (patch) | |
| tree | 41c2e1294abf1c32e1017c6d2504582b92d3afdf /git | |
| parent | 7e8450f3e1890e02ea92723e24f142dcfa9e2f03 (diff) | |
git: some new settings
inspired by https://jvns.ca/blog/2024/02/16/popular-git-config-options/
Diffstat (limited to 'git')
| -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/ |