How to set up .gitconfig for meld
Meld is a diff tool (open source/free) that works very well on ubuntu and MSYS2 windows
sudo apt install meld
To use it for git, create a ~/.gitconfig file with this content:
[user]
name = %your_name%
email = %your_email%
[pull]
rebase = false
[push]
autoSetupRemote = true
[diff]
tool = meld
submodule = diff
[difftool]
prompt = false
[difftool "meld"]
cmd = meld \"$LOCAL\" \"$REMOTE\"
[merge]
tool = meld
[mergetool "meld"]
cmd = meld \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\"
[alias]
vdiff = !git difftool --dir-diff
[credential]
helper = store