Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Git - update mergetool

  • Loading branch information...
commit b80c580a83bd8675f91c4197153112924f9db012 1 parent ab41263
@Funkmyster authored
Showing with 4 additions and 2 deletions.
  1. +3 −1 git/gitconfig
  2. +1 −1  vim/vim/bundle/vundle
View
4 git/gitconfig
@@ -10,9 +10,11 @@
editor = vim -c ':normal gg'
[merge]
- tool = vimdiff
+ tool = fugitive
[commit]
template = ~/.git.commit.template
[alias]
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
+[mergetool "fugitive"]
+ cmd = vim -f -c \"Gdiff\" \"$MERGED\"
2  vim/vim/bundle/vundle
@@ -1 +1 @@
-Subproject commit 2a494ff00fc10ed5725fbb99ec267ec2c9917817
+Subproject commit 5dd478e18e2a613466776c94f16dd5c329123cae
Please sign in to comment.
Something went wrong with that request. Please try again.