Skip to content

Instantly share code, notes, and snippets.

@artemsky

artemsky/.gitconfig

Last active June 22, 2017 11:23
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save artemsky/a77e04d221dc6c9d6c3acb17ab4903e5 to your computer and use it in GitHub Desktop.
Save artemsky/a77e04d221dc6c9d6c3acb17ab4903e5 to your computer and use it in GitHub Desktop.
Download ZIP
Phpstrom mergetool with git cli
Raw
.gitconfig
[merge]
tool = phpstorm
[mergetool "phpstorm"]
cmd = 'C:/Program Files/JetBrains/PhpStorm 2017.1.4/bin/phpstorm64.exe' 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment