1 changed files with
11 additions and
1 deletions
-
11
1
gitconfig
|
@@ -32,11 +32,20 @@
|
|
|
|
|
|
|
|
[core]
|
|
[core]
|
|
|
editor = vi
|
|
editor = vi
|
|
|
- pager = diff-so-fancy | less -FXRS -x4
|
|
|
|
|
|
|
+ pager = delta
|
|
|
untrackedCache = true
|
|
untrackedCache = true
|
|
|
|
|
|
|
|
|
|
+[interactive]
|
|
|
|
|
+ diffFilter = delta --color-only
|
|
|
|
|
+
|
|
|
|
|
+[delta]
|
|
|
|
|
+ line-numbers = false
|
|
|
|
|
+ navigate = true
|
|
|
|
|
+ side-by-side = true
|
|
|
|
|
+
|
|
|
[merge]
|
|
[merge]
|
|
|
defaultToUpstream = true
|
|
defaultToUpstream = true
|
|
|
|
|
+ conflictstyle = diff3
|
|
|
|
|
|
|
|
[rebase]
|
|
[rebase]
|
|
|
autosquash = true
|
|
autosquash = true
|
|
@@ -56,6 +65,7 @@
|
|
|
[diff]
|
|
[diff]
|
|
|
tool = kitty
|
|
tool = kitty
|
|
|
guitool = kitty.gui
|
|
guitool = kitty.gui
|
|
|
|
|
+ colorMoved = default
|
|
|
[difftool]
|
|
[difftool]
|
|
|
prompt = false
|
|
prompt = false
|
|
|
trustExitCode = true
|
|
trustExitCode = true
|
