Skip to content

Instantly share code, notes, and snippets.

@si9ma

si9ma/git config.txt

Last active May 15, 2019 00:54
Show Gist options
  • Save si9ma/a5590764e7d83e0091fd9c55b97de200 to your computer and use it in GitHub Desktop.
Save si9ma/a5590764e7d83e0091fd9c55b97de200 to your computer and use it in GitHub Desktop.
Download ZIP
git config - diff and merge tool(meld)
Raw
git config.txt
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"
[merge]
tool = meld
[mergetool "meld"]
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment