Gaze/dotar
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #230 from treppo/patch-1

Browse Source 
Configure Macvim as the standard git mergetool
This commit is contained in:
Yan Pritzker 2013-01-06 09:30:19 -08:00
commit eb6b4e3df4
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git/gitconfig
View File

@ -84,9 +84,15 @@
svnl = svn log --oneline --show-commit svnl = svn log --oneline --show-commit
[format] [format]
pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset
[mergetool]
prompt = false
[mergetool "mvimdiff"]
cmd="mvim -c 'Gdiff' $MERGED" # use fugitive.vim for 3-way merge
keepbackup=false
[merge] [merge]
summary = true summary = true
verbosity = 1 verbosity = 1
tool = mvimdiff
[apply] [apply]
whitespace = nowarn whitespace = nowarn
[branch] [branch]