Skip to content

Instantly share code, notes, and snippets.

@mrfratello
Last active February 5, 2018 09:48
Show Gist options
  • Save mrfratello/ff46876a91fc5c500a0e014e9a963bef to your computer and use it in GitHub Desktop.
Save mrfratello/ff46876a91fc5c500a0e014e9a963bef to your computer and use it in GitHub Desktop.
gitconfig with alias and mergetool as meld
[user]
# Please adapt and uncomment the following lines:
name = username
email = email
[alias]
st = status
co = checkout
ci = commit
br = branch
[merge]
tool = meld
[mergetool "meld"]
keepBackup = false
trustExitCode = false
cmd = meld \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment