git vimdiff conf

3 years ago · 472d91122c
parent 201802c1ae
commit 472d91122c
1 changed files with 4 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -1,6 +1,9 @@
 [diff]
 	tool = vimdiff

+[difftool "vimdiff"]
+	cmd = vimdiff \"$LOCAL\" \"$REMOTE\"
+
 [core]
 	pager = less -FRX
 [alias]
@ -10,6 +13,7 @@
 	sglog  = log --oneline --decorate --graph --all
 	co     = checkout
 	out    = log --branches --not --remotes
+	vimdiff = difftool -y -t vimdiff
 [user]
 	name = Petr Nyc
 	email = jet.jetpac@gmail.com