Rodolphe Marques r-marques
r-marques
/ .gitconfig
Last active
August 29, 2015 14:22
— forked from ViktorStiskala/.gitconfig
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [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" |