git config

[diff]

    tool = meld

[difftool]

    prompt = false

[difftool "meld"]

    cmd = meld "$LOCAL" "$REMOTE"

[merge]

    tool = meld

[mergetool "meld"]

    # Choose one of these 2 lines (not both!) explained below.

    cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"

    # cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"

[gui]

encoding = utf-8

[guitool "branch list"]

cmd = git branch

[guitool "fetch"]

cmd = git fetch

[guitool "gitk"]

cmd = gitk --all

noconsole = yes

[guitool "pull"]

cmd = git pull

[guitool "set upstream"]

cmd = git branch --set-upstream-to=origin/$ARGS $ARGS

argprompt = yes

[guitool "stash apply"]

cmd = git stash apply $ARGS

noconsole = yes

argprompt = yes

[guitool "stash drop"]

cmd = git stash drop $ARGS

noconsole = yes

argprompt = yes

[guitool "stash list"]

cmd = git stash list

[guitool "stash save"]

cmd = git stash save

noconsole = yes