coachoreo.blogg.se

You can also change the commit message, or edit the content of the commits. "\" escape next character as well so I had to tripple them myself to display two \\. Combine (squash) multiple commits together, or re-order them, simply by dragging & dropping. It seems due to the textfields on this website. I don't know for windows but on Mac to make it work I had to double escape white space in executable path like follow :Ĭmd = /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\") Once you're set up, just use git difftool or git mergetool to invoke your sweet new diff UI! I believe this works in IntelliJ >= 10.5 (or similar vintage of the other tools), but I've only actually tested it with IntelliJ 12.

#Sourcetree for mac using diffmerge how to

Here's how to use it with Git: MacĬmd = /Applications/IntelliJ\ IDEA.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")Ĭmd = /Applications/IntelliJ\ IDEA.app/Contents/MacOS/idea diff $(cd $(dirname "$LOCAL") & pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") & pwd)/$(basename "$REMOTE")Ĭmd = cmd.exe //c "\"C:/Program Files (x86)/IntelliJ IDEA Community Edition 12.0/bin/idea.bat\" merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""Ĭmd = cmd.exe //c "\"C:/Program Files (x86)/IntelliJ IDEA Community Edition 12.0/bin/idea.bat\" diff \"$LOCAL\" \"$REMOTE\""īe sure to adjust the path as needed for your version of IntelliJ, WebStorm, PHPStorm, etc. JetBrains's IntelliJ IDEA (and related IDEs like WebStorm) include a diff/merge tool that is just awesome.