Skip to content

Instantly share code, notes, and snippets.

Avatar

Santhosh Dhandapani SanthoshDhandapani

View GitHub Profile
@SanthoshDhandapani
SanthoshDhandapani / .gitconfig
Last active May 4, 2017 — forked from rambabusaravanan/.gitconfig
Git Diff and Merge Tool - IntelliJ
View .gitconfig
# Linux
# add the following to "~/.gitconfig" file
[merge]
tool = intellij
[mergetool "intellij"]
cmd = /usr/local/bin/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]