vero4karu
8/13/2013 - 1:27 PM

Pycharm as a default git difftool and git mergetool. Add the following to ~/.gitconfig

Pycharm as a default git difftool and git mergetool. Add the following to ~/.gitconfig

.gitconfig
content_copyfile_download
[diff]
    tool = pycharm
[difftool "pycharm"]
    cmd = /usr/local/bin/pycharm diff "$LOCAL" "$REMOTE" && echo "Press enter to continue..." && read
[merge]
    tool = pycharm
    keepBackup = false
[mergetool "pycharm"]
    cmd = /usr/local/bin/pycharm merge "$LOCAL" "$REMOTE" "$BASE" "$MERGED"