Skip to content

Instantly share code, notes, and snippets.

@zolotyh

zolotyh/.gitignore

Created September 26, 2019 03:24
Show Gist options
  • Save zolotyh/c03f5887f1dce22dcce62d6c233d01da to your computer and use it in GitHub Desktop.
Save zolotyh/c03f5887f1dce22dcce62d6c233d01da to your computer and use it in GitHub Desktop.
Download ZIP
Raw
.gitignore
[mergetool "intellij"]
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") \
&& read -n 1 -s
[mergetool "vscode"]
cmd = code --wait $MERGED
[merge]
tool = intellij
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment