Last active
March 13, 2020 09:23
-
-
Save vgaidarji/4adaa6a4828ac95c01ed663411c3e187 to your computer and use it in GitHub Desktop.
Use AndroidStudio as git difftool/mergetool on MacOS (place this inside your ~/.gitconfig).
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
| [merge] | |
| tool = studio | |
| [mergetool "studio"] | |
| prompt = false | |
| cmd = /Applications/Android\\ Studio.app/Contents/MacOS/studio merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED") | |
| trustExitCode = true | |
| [diff] | |
| tool = studio | |
| [difftool "studio"] | |
| prompt = false | |
| cmd = /Applications/Android\\ Studio.app/Contents/MacOS/studio diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Update: disabled "prompt" by default.