Created
January 28, 2019 08:36
-
-
Save Hlight/e2c423f6ab44758186f5d606a877ef5d to your computer and use it in GitHub Desktop.
Meld OSX .gitconfig + CLI alias
This file contains hidden or 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
| # Paste this into ~/.gitconfig to enable meld for `git difftool` and `git mergetool`. | |
| #### USE: meld | |
| # Optional command line usage place below line in .bashrc | |
| # alias meld="/Applications/Meld.app/Contents/MacOS/Meld" | |
| [diff] | |
| tool = meld | |
| [difftool] | |
| prompt = false | |
| [difftool "meld"] | |
| trustExitCode = true | |
| cmd = open -W -a Meld --args \"$LOCAL\" \"$PWD/$REMOTE\" | |
| [merge] | |
| tool = meld | |
| [mergetool] | |
| prompt = false | |
| [mergetool "meld"] | |
| trustExitCode = true | |
| cmd = open -W -a Meld --args --auto-merge \"$PWD/$LOCAL\" \"$PWD/$BASE\" \"$PWD/$REMOTE\" --output=\"$PWD/$MERGED\" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment