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

git: use meld as mergetool

master
Guillaume DOTT 2013-02-21 17:17:09 +01:00
parent 0813f3d3e0
commit 1b7beb872c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git/gitconfig.include
View File

@ -7,11 +7,12 @@
co = checkout co = checkout
pr = pull --rebase pr = pull --rebase
dc = diff --cached dc = diff --cached
r = remote
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
ll = log --stat --abbrev-commit ll = log --stat --abbrev-commit
amend = commit --amend -C HEAD amend = commit --amend -C HEAD
[diff] [diff]
tool = vimdiff tool = vimdiff
[merge] [merge]
tool = vimdiff tool = meld
# vim: set filetype=gitconfig: # vim: set filetype=gitconfig: