Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- # 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]
- tool = intellij
- [difftool "intellij"]
- cmd = /usr/local/bin/idea diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
- # Mac
- # add the following to "~/.gitconfig" file
- [merge]
- tool = intellij
- [mergetool "intellij"]
- cmd = /Applications/IntelliJ\\ IDEA.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.app/Contents/MacOS/idea diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
- # Windows
- # add the following to "C:\Users\<username>\.gitconfig" file
- [merge]
- tool = intellij
- [mergetool "intellij"]
- cmd = cmd.exe //c "\"d:/Install/Programming/Java/Ide/Idea/ideaIU-2018.1.1.win/bin/idea.bat\" merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
- trustExitCode = true
- [diff]
- tool = intellij
- [difftool "intellij"]
- cmd = cmd.exe //c "\"d:/Install/Programming/Java/Ide/Idea/ideaIU-2018.1.1.win/bin/idea.bat\" diff \"$LOCAL\" \"$REMOTE\""
Add Comment
Please, Sign In to add comment