Created
October 27, 2014 10:06
-
-
Save CiprianSpiridon/bd80e805b49ef7513a7e to your computer and use it in GitHub Desktop.
How to usePHPStorm/WebStorm as git diff and merge tools
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
# ~/.gitconfig | |
# Add this to your global git configuration file | |
# Change phpstorm to webstorm, if you use that. | |
# Diff and merge tool changes | |
# Run `git difftool <directory/file>...` or `git mergetool <directory/file>...` | |
[merge] | |
tool = phpstorm | |
[diff] | |
tool = phpstorm | |
[difftool] | |
; This setting is optional, but prevents an annoying prompt between diffing files. | |
prompt = false | |
[difftool "phpstorm"] | |
; Putting this path here doesn't work. I would love to know why. | |
; path = /Applications/PHPStorm.app/Contents/MacOS | |
cmd = webide diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") | |
trustExitCode = true | |
[mergetool "phpstorm"] | |
cmd = webide 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 |
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
# Add this to your .profile, .zshrc, .bashrc, etc. | |
# Add PHPStorm's bin directory to your path. | |
export PATH="/Applications/PHPStorm.app/Contents/MacOS:$PATH" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment