Basic .gitconfig file

.gitconfig

[alias]
    st = status
    br = branch
    ci = commit
    cp = cherry-pick
    co = checkout
    sub = submodule

[diff]
    color = auto
    external = /Users/$USER/git_diff_wrapper

[pager]
    diff =

[color]
    diff = auto
    status = auto
    branch = auto
    ui = auto

[status]
    color = auto

[branch]
    color = auto

[merge]
    tool = araxismerge

[mergetool "araxismerge"]
    cmd = "/usr/bin/compare -3 -merge -wait $LOCAL $BASE $REMOTE $MERGED"
    path = /usr/bin/

[http]
    sslverify = false

[push]
    default = current

[core]
    editor = /usr/bin/vim

git_diff_wrapper

#!/bin/sh
vimdiff "$2" "$5"