Last active
February 5, 2018 09:48
-
-
Save mrfratello/ff46876a91fc5c500a0e014e9a963bef to your computer and use it in GitHub Desktop.
gitconfig with alias and mergetool as meld
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[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