My .gitconfig file. Don't forget to install p4merge from http://filehost.perforce.com/perforce/r13.4/bin.macosx106x86/P4V.dmg and follow the instructions at http://www.andymcintosh.com/?p=33

.gitconfig

# NB: Don't forget to install p4merge from
#     http://filehost.perforce.com/perforce/r13.4/bin.macosx106x86/P4V.dmg
#     and follow the configuration instructions at http://www.andymcintosh.com/?p=33

# Some interesting .git_config files here:
# http://stackoverflow.com/questions/267761/what-does-your-gitconfig-contain

[user]
    name = YOUR NAME HERE
    email = YOUR EMAIL HERE

[branch]
    autosetupmerge = true

[color]
    diff = auto
    status = auto
    branch = auto
    interactive = auto
    pager = true

[color "branch"]
    current = yellow reverse
    local = yellow
    remote = green

[color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold

[color "status"]
    added = yellow
    changed = green
    untracked = cyan

[merge]
    #tool = vimdiff
    keepBackup = false
    tool = p4merge

[mergetool "p4merge"]
    cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false

#[diff]
#    tool = vimdiff

[core]
    excludesfile = /Users/mat/.gitignore
    pager = less -FRSX
    whitespace=-indent-with-non-tab,cr-at-eol,fix,nowarn,trailing-space
    autocrlf = input

[apply]
    whitespace = fix

[push]
    default = current

[alias]
    a = add
    ap = add -p

    # Silly-esque shortcuts and typo permutations for `branch`.
    b = branch
    br = branch
    bran = branch
    branc = branch
    branhc = branch
    brna = branch
    brnac = branch
    brnach = branch

    c = commit
    ca = commit --amend
    amend = commit --amend
    am = commit --amend

    cl = clone

    ci = commit
    com = commit
    comm = commit
    comi = commit
    commi = commit
    comit = commit

    co = checkout

    # Silly-esque shortcuts and typo permutations for `diff`.
    d = diff
    di = diff
    df = diff
    dif = diff
    idff = diff
    idfff = diff
    dfif = diff
    dfiff = diff

    # `patch` compatible diff output:
    dp = diff --no-prefix
    diffp = diff --no-prefix
    diff-p = diff --no-prefix
    diffpatch = diff --no-prefix
    diff-patch = diff --no-prefix
    diff4p = diff --no-prefix
    diff-4p = diff --no-prefix
    diff4patch = diff --no-prefix
    diff-4patch = diff --no-prefix

    # Show staged changes:
    dc = diff --cached
    diffc = diff --cached
    diffs = diff --cached
    diffstaged = diff --cached
    diff-staged = diff --cached

    ds = !git --no-pager diff --stat -M -w

    graph = log --graph --oneline --decorate

    info = config --list

    l = log
    lo = log
    lg = log
    lgp = log -p

    lol = log --graph --decorate --pretty=oneline --abbrev-commit
    lola = log --graph --decorate --pretty=oneline --abbrev-commit --all

    ls = ls-files

    pusho = push origin
    pushom = push origin master
    po = pull origin master
    pullo = pull origin
    pullom = pull origin master
    pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master"

    psuh = push
    puhs = push

    # Silly-esque shortcuts and typo permutations for `remote`.
    renite = remote

    sb = show-branch

    # Silly-esque shortcuts and typo permutations for `status`.
    s = status
    st = status
    sta = status
    stat = status
    stast = status
    stasts = status
    stastsu = status

    stage = add 

    staged = diff --cached

    si = submodule init
    subi = submodule init
    subin = submodule init
    subini = submodule init
    subinit = submodule init

    su = submodule update
    subup = submodule update
    subupd = submodule update
    subupda = submodule update
    subupdat = submodule update
    subupdate = submodule update
    submodu = submodule update
    submodup = submodule update
    submodupd = submodule update
    submodupda = submodule update
    submodupdat = submodule update
    submodupdate = submodule update

    summary = log --oneline

    tags = tag -n1 -l

    unadd = reset HEAD --
    unstage = reset HEAD --

    w = whatchanged