Skip to content

Instantly share code, notes, and snippets.

@ViktorStiskala

ViktorStiskala/.gitconfig

Created August 13, 2013 13:27
Show Gist options
  • Star 7 You must be signed in to star a gist
  • Fork 4 You must be signed in to fork a gist
  • Save ViktorStiskala/6221049 to your computer and use it in GitHub Desktop.
Save ViktorStiskala/6221049 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/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"
@bittner
Copy link

bittner commented Feb 1, 2014

Looks like the 'merge' parameter is not available anymore in PyCharm version 3. :-(

@chrisamow
Copy link

It is back in 3.4.1 !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment