ambroisie/dot-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[ADD][GIT] Use vim-fugitive as default mergetool

Browse source 
I really like the way vim-fugitive show a merge conflict by having our
local index on the left (the target), and the remote changes on the
right (what we're trying to merge with our branch). The result is
obviously the file in the middle.

The d2o and d3o mappings take from local/remote for the current chunk.
This commit is contained in:
Bruno BELANYI 2019-10-13 13:41:19 +02:00
parent 6dd31874c8
commit 4e6821a0f2
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
git/.gitconfig
View file

@ -40,6 +40,13 @@
[diff] [diff]
algorithm = patience algorithm = patience
[merge]
tool = fugitive
[mergetool "fugitive"]
cmd = vim -f -c \"Gdiff!\" \"$MERGED\"
trustExitCode = true
[pager] [pager]
diff = /usr/share/git/diff-highlight/diff-highlight | less diff = /usr/share/git/diff-highlight/diff-highlight | less
log = /usr/share/git/diff-highlight/diff-highlight | less log = /usr/share/git/diff-highlight/diff-highlight | less