summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--git/dot-gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/git/dot-gitconfig b/git/dot-gitconfig
index a0da7d2..1827554 100644
--- a/git/dot-gitconfig
+++ b/git/dot-gitconfig
@@ -9,10 +9,12 @@
tool = nvimdiff
[merge]
tool = nvimdiff
+ conflictStyle = diff3
[push]
default = simple
[alias]
lg = log --graph --oneline --decorate --all
+ overview = log --graph --oneline --decorate --all --simplify-by-decoration
[pull]
ff = only
[init]