diff options
| author | Anton Bobov <anton@bobov.name> | 2023-09-14 23:14:53 +0500 |
|---|---|---|
| committer | Anton Bobov <anton@bobov.name> | 2023-09-14 23:17:30 +0500 |
| commit | 25b2150f0ac00d31f4f4228ed1efff6bf084dcf3 (patch) | |
| tree | 9a5e656136fe165c2cb1bd08c79633aa7046fa2e /files/.gitconfig | |
| parent | f8bd3c75f07b248dbbc102c14d4db79fe4babb58 (diff) | |
[git] Update config
Diffstat (limited to 'files/.gitconfig')
| -rw-r--r-- | files/.gitconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/files/.gitconfig b/files/.gitconfig index 277fc43..3b3ca6a 100644 --- a/files/.gitconfig +++ b/files/.gitconfig @@ -19,7 +19,9 @@ new = green bold whitespace = red reverse [diff] + algorithm = histogram tool = vimdiff + colorMoved = true [difftool] prompt = false [diff-so-fancy] @@ -28,7 +30,7 @@ [grep] lineNumber = true [merge] - conflictstyle = diff3 + conflictstyle = zdiff3 stat = true tool = vimdiff [core] @@ -98,7 +100,9 @@ [rebase] instructionFormat = %s [%an] {%ar} autoStash = true + updateRefs = true [rerere] + autoUpdate = true enabled = true [status] submoduleSummary = true |