aboutsummaryrefslogtreecommitdiff
path: root/git/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'git/.gitconfig')
-rw-r--r--git/.gitconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
index c6e923f..a67a232 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -9,5 +9,10 @@
last = log -1 --stat
unstage = reset HEAD --
cached = diff --cached
+ d = difftool
[color]
ui = auto
+[diff]
+ tool = vimdiff
+[difftool]
+ prompt = false