Skip to content

Instantly share code, notes, and snippets.

@stoe stoe/.gitconfig
Created Aug 4, 2015

Embed
What would you like to do?
WebStorm DiffMerge
[mergetool]
keepBackup = false
[merge]
tool = wstorm
[mergetool "wstorm"]
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
[difftool]
prompt = false
[diff]
tool = wstorm
[difftool "wstorm"]
cmd = /Applications/WebStorm.app/Contents/MacOS/webstorm diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
@stoe

This comment has been minimized.

Copy link
Owner Author

stoe commented Aug 4, 2015

Add this to ~/.gitconfig to use WebStorm as a diff- and mergetool.

Usage:

  • git difftool
  • git mergetool
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.