My gitconfig

.gitconfig

[user]
    email           = [email protected]
    name            = Zach Kelling

[github]
    user            = zeekay

[alias]
    br              = branch
    ci              = commit
    co              = checkout
    coi             = checkout-index
    coi-ours        = checkout-index -f -a --stage=2
    coi-theirs      = checkout-index -f -a --stage=3
    cp              = cherry-pick
    df              = diff --color=never
    ds              = diff --stat --color=never
    ds              = diff --staged --color=never
    g               = grep --break --heading --line-number
    last            = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white)%an, %ar%Creset' -n 20
    lc              = log ORIG_HEAD.. --stat --no-merges
    lp              = log --patch --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white)%an, %ar%Creset'
    ls              = log --stat --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white)%an, %ar%Creset'
    mt              = mergetool -y
    pu              = pull
    pul             = pull
    pus             = push
    rb              = rebase
    rbc             = rebase --continue
    rbs             = rebase --skip
    rl              = reflog
    rp              = remote prune
    rs              = remote show
    rt              = remote
    ru              = remote update
    sb              = show-branch
    st              = status -s

    catchup         = log --patch --reverse --topo-order _ribbon..origin/master
    changes         = diff --name-status -r
    current-branch  = !git symbolic-ref -q HEAD | sed -e 's|^refs/heads/||'
    diffall         = diff HEAD --color=never
    diffstat        = diff --stat --color=never
    fetch-all       = fetch --depth=999999999
    forget          = rm --cached
    lost            = !"git fsck | awk '/dangling commit/ {print $3}' | git show --format='SHA1: %C(yellow)%h%Cblue%d%Creset %s %C(white)%an, %ar%Creset' --stdin | awk '/SHA1/ {sub(\"SHA1: \", \"\"); print}'"
    new             = !hub create && git push --set-upstream origin master
    pop             = stash pop
    push-new        = !git push -u origin `git rev-parse --abbrev-ref HEAD`
    record          = !sh -c '(git add -p -- $@ && git commit) || git reset' --
    reset-origin    = !git fetch && git reset --hard "origin/`git rev-parse --abbrev-ref HEAD`"
    ribbon          = tag --force _ribbon origin/master
    root            = !pwd
    serve           = daemon --reuseaddr --verbose  --base-path=. --export-all ./.git
    stage           = add
    staged          = diff --staged
    svn-ci          = svn dcommit
    svn-up          = svn rebase
    tags            = tag -l
    track           = checkout -t
    undo            = reset --soft HEAD^
    unstage         = reset HEAD
    unstaged        = diff

[core]
    autocrlf        = false
    excludesfile    = ~/.cvsignore
    whitespace      = trailing-space,space-before-tab
    editor          = git-editor

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

[advice]
    statusHints     = false

[branch]
    autosetupmerge  = true

[push]
    default         = tracking

[rebase]
    autosquash      = true

[rerere]
    enabled         = false

[credential]
	helper          = cache

[grep]
    lineNumber      = true

[instaweb]
    httpd           = webrick

[diff]
    mnemonicprefix  = true
    renames         = copies

[merge]
    stat            = true
    tool            = vim

[mergetool]
    keepBackup      = false

[mergetool "vim"]
    cmd             = vim -u ~/.vimgitrc "+Gdiff" $MERGED -c '"call vice#git#merge()"'

[hub]
    protocol        = ssh

[gist]
    browse          = true