guillaume
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git: set vimdiff as difftool and mergetool

master
Guillaume DOTT 2012-11-08 15:08:01 +01:00
parent dc9111b539
commit 142604f152
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git/gitconfig.include
View File

@ -5,4 +5,8 @@
st = status st = status
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
ll = log --stat --abbrev-commit ll = log --stat --abbrev-commit
[diff]
tool = vimdiff
[merge]
tool = vimdiff
# vim: set filetype=gitconfig: # vim: set filetype=gitconfig: