[user] name = Felix Steghofer email = felix.steghofer@gmail.com [push] default = simple [merge] tool = intellij [core] autocrlf = input [mergetool "intellij"] cmd = /usr/bin/intellij-idea-ultimate-edition 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 = code [difftool "intellij"] cmd = /usr/bin/intellij-idea-ultimate-edition diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") [difftool "code"] cmd = code --wait --diff $LOCAL $REMOTE [alias] quick-stats = ! /usr/local/bin/git-quick-stats