commit 66db010e9448e9e988b27fdeb38f0e43af28e9a8
parent 2735a9546c3ea3dfaf5e138c9b05bbf8ef3e3992
Author: Chris Bracken <chris@bracken.jp>
Date: Tue, 4 Nov 2014 09:59:42 -0800
Vimdiff support
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitconfig b/.gitconfig
@@ -1,13 +1,13 @@
[alias]
lol = log --pretty=format:'%C(yellow)%h%C(reset) %C(green)%cr%C(reset) %C(blue)%cn%C(reset) %C(yellow)%d%C(reset) %s'
+ vimdiff = difftool
[color]
ui = auto
[core]
excludesfile = ~/.gitignore_global
[diff]
mnemonicprefix = true
-[diff "vimdiff"]
- command = git-vimdiff
+ tool = vimdiff
[merge]
stat = true
[push]