aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxero <x@xero.nu>2016-01-13 21:40:57 -0500
committerxero <x@xero.nu>2016-01-13 21:40:57 -0500
commit322b3c56a089697d39e931a1f2d70ad0fdc93747 (patch)
treeb1e83232c4e8eda02290df26f0430b371db262ce
parent94bf37f2ffb0056db4e0411089c4a88033f146f6 (diff)
downloaddotfiles_ascii-322b3c56a089697d39e931a1f2d70ad0fdc93747.tar.xz
dotfiles_ascii-322b3c56a089697d39e931a1f2d70ad0fdc93747.zip
use vimdiff as the git difftool
-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