From 4e6821a0f24c92d3b09e2b1121921453729e0bf1 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 13 Oct 2019 13:41:19 +0200 Subject: [PATCH] [ADD][GIT] Use vim-fugitive as default mergetool 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. --- git/.gitconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/git/.gitconfig b/git/.gitconfig index 1d59f75..f42f207 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -40,6 +40,13 @@ [diff] algorithm = patience +[merge] + tool = fugitive + +[mergetool "fugitive"] + cmd = vim -f -c \"Gdiff!\" \"$MERGED\" + trustExitCode = true + [pager] diff = /usr/share/git/diff-highlight/diff-highlight | less log = /usr/share/git/diff-highlight/diff-highlight | less