Last active
November 18, 2015 07:27
-
-
Save bslagter/e156bd1997b8ac3ede8e to your computer and use it in GitHub Desktop.
Use PhpStorm as difftool for review of feature branches
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
| [alias] | |
| phpstorm-review = "!f_checkout() { local SHA=${1:-HEAD}; local BRANCH=${2:-master}; if [ $SHA == $BRANCH ]; then SHA=HEAD; fi; git difftool -d -t phpstorm $BRANCH...$SHA; }; f_checkout" | |
| [difftool "phpstorm"] | |
| cmd = ~/git/viewInPhpStorm.sh diff \"$LOCAL\" \"$REMOTE\" |
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
| #!/bin/bash | |
| /Applications/PhpStorm.app/Contents/MacOS/phpstorm $* | |
| read -p "Press [Enter] key to continue..." |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment