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

[ADD][GIT] Alias m4 to vimdiff 4-window view

Browse source 
Sometimes it is useful to also have the base file accessible when
merging branches. This view still has the local file on the left and the
remote branch on the right, with the base in the middle and the result
at the bottom.

The d1o/d2o/d3o take from the local/base/remote for the current file.
This commit is contained in:
Bruno BELANYI 2019-10-13 13:42:47 +02:00
parent 4e6821a0f2
commit a7bdded5c6
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
git/.gitconfig
View file

@ -69,6 +69,7 @@
chop = gc --prune=now chop = gc --prune=now
optimize = repack -a -d -f --depth=250 --window=250 optimize = repack -a -d -f --depth=250 --window=250
pf = pull --ff-only pf = pull --ff-only
m4 = mergetool -t vimdiff
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f