Skip to content

Instantly share code, notes, and snippets.

@gregkepler

gregkepler/.gitconfig

Created November 1, 2017 17:21
Show Gist options
  • Save gregkepler/55e6dea505d623a835cd8aff050733b9 to your computer and use it in GitHub Desktop.
Save gregkepler/55e6dea505d623a835cd8aff050733b9 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. gregkepler created this gist Nov 1, 2017.
    21 changes: 21 additions & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,21 @@
    # ------------------ M E R G E -------------------------
    [merge]
    tool = meld

    [mergetool "meld"]
    cmd = \"C:\\Program Files (x86)\\Meld\\Meld.exe\" --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\" --label \"MERGE (REMOTE BASE MY)\"
    trustExitCode = false

    [mergetool]
    # don't ask if we want to skip merge
    prompt = false

    # don't create backup *.orig files
    keepBackup = false

    # ------------------ D I F F -------------------------
    [diff]
    guitool = meld

    [difftool "meld"]
    cmd = \"C:\\Program Files (x86)\\Meld\\Meld.exe\" \"$LOCAL\" \"$REMOTE\" --label \"DIFF (ORIGINAL MY)\"