Skip to content

Instantly share code, notes, and snippets.

@unok

unok/.gitconfig

Created February 14, 2014 06:49
Show Gist options
  • Star 5 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save unok/8996791 to your computer and use it in GitHub Desktop.
Save unok/8996791 to your computer and use it in GitHub Desktop.
Download ZIP
gitconfig for intellij merge tool
Raw
.gitconfig
[merge]
tool = intellij
[mergetool "intellij"]
cmd = /Applications/IntelliJ\\ IDEA\\ 13.app/Contents/MacOS/idea 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
[diff]
tool = intellij
[difftool "intellij"]
cmd = /Applications/IntelliJ\\ IDEA\\ 13.app/Contents/MacOS/idea diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment