Skip to content

Instantly share code, notes, and snippets.

@gko

gko/.gitconfig

Created April 22, 2020 11:09
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 gko/ede57b883ea3b6f93c7db2568892df36 to your computer and use it in GitHub Desktop.
Save gko/ede57b883ea3b6f93c7db2568892df36 to your computer and use it in GitHub Desktop.
Download ZIP
webstorm as merge and difftool for git
Raw
.gitconfig
[difftool "webstorm"]
cmd = /Applications/WebStorm.app/Contents/MacOS/webstorm diff $(cd $(dirname \"$LOCAL\") && pwd)/$(basename \"$LOCAL\") $(cd $(dirname \"$REMOTE\") && pwd)/$(basename \"$REMOTE\")
trustExitCode = true
[mergetool "webstorm"]
cmd = /Applications/WebStorm.app/Contents/MacOS/webstorm 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
[merge]
keepBackup = false
tool = webstorm
[diff]
tool = webstorm
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment