Skip to content

Instantly share code, notes, and snippets.

@NamPNQ

NamPNQ/.gitconfig

Forked from ViktorStiskala/.gitconfig
Created February 17, 2016 06:33
Show Gist options
  • Star 6 You must be signed in to star a gist
  • Fork 2 You must be signed in to fork a gist
  • Save NamPNQ/45ac6ea84dc68b5d3a54 to your computer and use it in GitHub Desktop.
Save NamPNQ/45ac6ea84dc68b5d3a54 to your computer and use it in GitHub Desktop.
Download ZIP
Pycharm as a default git difftool and git mergetool. Add the following to ~/.gitconfig
Raw
.gitconfig
[diff]
tool = pycharm
[difftool "pycharm"]
cmd = /usr/local/bin/charm diff "$LOCAL" "$REMOTE" && echo "Press enter to continue..." && read
[merge]
tool = pycharm
keepBackup = false
[mergetool "pycharm"]
cmd = /usr/local/bin/charm merge "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment