-
-
Save Rubentxu/bba76c740c58e904bf2c60aaaf61c5da to your computer and use it in GitHub Desktop.
git mergetool config (by command line or .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 = intellij | |
| # tool = Kaleidoscope | |
| [diff] | |
| tool = intellij | |
| # tool = Kaleidoscope | |
| # intellij mergetool config | |
| [mergetool "intellij"] | |
| cmd = /Applications/IntelliJ\\ IDEA\ 13\\ CE.app/Contents/MacOS/idea 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 | |
| [difftool "intellij"] | |
| cmd = /Applications/IntelliJ\\ IDEA\ 13\\ CE.app/Contents/MacOS/idea diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") | |
| # Kaleidoscope for merge tool | |
| [difftool "Kaleidoscope"] | |
| cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" | |
| [mergetool "Kaleidoscope"] | |
| cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot | |
| trustExitCode = true |
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
| # use intellij as your merge tool | |
| git config --global mergetool.intellij.cmd '/Applications/IntelliJ\ IDEA\ 13\ CE.app/Contents/MacOS/idea 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")' | |
| git config --global mergetool.intellij.trustExitCode false | |
| git config --global merge.tool intellij | |
| git mergetool -y |
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
| # use sourcetree as your merge tool | |
| git config --global mergetool.sourcetree.cmd "sourcetree \$LOCAL \$REMOTE" | |
| git config --global mergetool.sourcetree.trustExitCode false | |
| git config --global merge.tool sourcetree | |
| git mergetool -y |
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
| # use Sublime as your merge tool | |
| git config --global mergetool.sublime.cmd "subl -w \$LOCAL \$REMOTE" | |
| git config --global mergetool.sublime.trustExitCode false | |
| git config --global merge.tool sublime | |
| git mergetool -y | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment