Skip to content

Instantly share code, notes, and snippets.

@BoZenKhaa
Forked from NamPNQ/.gitconfig
Last active January 29, 2023 14:20
Show Gist options
  • Save BoZenKhaa/742c2d3a018b143c44eb2c9a672e8554 to your computer and use it in GitHub Desktop.
Save BoZenKhaa/742c2d3a018b143c44eb2c9a672e8554 to your computer and use it in GitHub Desktop.
Pycharm as a default git difftool and git mergetool on Windows. Add the following to ~/.gitconfig
[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"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment