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

  • Select an option

    Learn more about clone URLs
  • Save NamPNQ/45ac6ea84dc68b5d3a54 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save NamPNQ/45ac6ea84dc68b5d3a54 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. NamPNQ revised this gist Feb 17, 2016. 1 changed file with 2 additions and 2 deletions.
    4 changes: 2 additions & 2 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -1,9 +1,9 @@
    [diff]
    tool = pycharm
    [difftool "pycharm"]
    cmd = /usr/local/bin/pycharm diff "$LOCAL" "$REMOTE" && echo "Press enter to continue..." && read
    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/pycharm merge "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
    cmd = /usr/local/bin/charm merge "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
  2. @ViktorStiskala ViktorStiskala created this gist Aug 13, 2013.
    9 changes: 9 additions & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,9 @@
    [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"