config/git
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set up merge tool and improve diffs

Browse Source 
* Use vimdiff2 for git mergetool
* Use patience diff algorithm for diff and merge
This commit is contained in:
Kenneth Benzie 2020-07-02 15:56:12 +01:00
parent 9d77e3e058
commit 347b263fd6
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config
View File

@ -61,9 +61,16 @@
[diff] [diff]
tool = vimdiff tool = vimdiff
algorithm = patience
[difftool] [difftool]
prompt = false prompt = false
[merge]
tool = vimdiff2
algorithm = patience
[mergetool]
prompt = false
[include] [include]
path = ~/.config/private/gitconfig path = ~/.config/private/gitconfig
path = ~/.config/work/gitconfig path = ~/.config/work/gitconfig