Jan BoZenKhaa
BoZenKhaa
/ .gitconfig
Last active
January 29, 2023 14:20
— forked from NamPNQ/.gitconfig
Pycharm as a default git difftool and git mergetool on Windows. Add the following to ~/.gitconfig
This file contains 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 = "/c/Program\ Files/JetBrains/PyCharm 2019.1.1/bin/pycharm" diff "$LOCAL" "$REMOTE" && echo "Press enter to continue..." && read | |
| [merge] | |
| tool = pycharm | |
| keepBackup = false | |
| [mergetool "pycharm"] | |
| cmd = "/c/Program Files/JetBrains/PyCharm 2019.1.1/bin/pycharm" merge "$LOCAL" "$REMOTE" "$BASE" "$MERGED" |