summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--git/.config/git/config12
1 files changed, 12 insertions, 0 deletions
diff --git a/git/.config/git/config b/git/.config/git/config
index 8b931fa..c1478a4 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -4,3 +4,15 @@
[credential]
helper = cache
helper = !type pass-git-helper >/dev/null && pass-git-helper $@
+[diff]
+ tool = nvimdiff
+[difftool]
+ prompt = false
+ # Be able to abort all diffs with `:cq` or `:cquit`
+ trustExitCode = true
+[alias]
+ st = status -sb
+ ci = commit -v
+ d = difftool
+ lol = log --graph --decorate --pretty=oneline --abbrev-commit
+ lola = log --graph --decorate --pretty=oneline --abbrev-commit --all