gitconfig

[user]
    name = richo
    email = richo@psych0tik.net
    signingkey = 89E72415
[include]
    path = /tmp/richo-work
[user "work"]
    name = Richard Healey
    email = richard.healey@99designs.com
[github]
    user = richoH
    token = [TOKEN CENSORED]
[core]
    excludesfile = ~/.cvsignore
    whitespace=fix,-indent-with-non-tab,trailing-space
    autocrlf=false
[color]
    branch = auto
    diff = auto
    status = auto
    interactive = auto
    grep = auto

[color "branch"]
    current = cyan bold
    local = yellow
    remote = green

[color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
[color "status"]
    added = green
    changed = red
    untracked = cyan
[format]
    pretty = medium
[log]
    date = default
    decorate = short
[push]
    default = tracking
[rebase]
    stat = true
[alias]
    addw = !sh -c 'git diff -w --no-color "$@" | git apply --cached' -
    bsg = bisect good
    bsb = bisect bad
    ci = commit -v
    co = checkout
    cp = cherry-pick
    ctags = !.git/hooks/ctags
    cs = commit -s
    dc = diff --cached
    detach = checkout HEAD^0
    df = diff
    fe = fetch
    ffo = merge --ff-only @{u}
    ffr = rebase origin/@{u}
    fmerge = merge --no-ff
    g = grep
    gfo = log --pretty=graphable --graph --date=short HEAD~..@{u}
    graph = log --pretty=graphable --graph --date=short
    lfo = log HEAD~..@{u}
    pall = pull --all
    pushup = "!f() { n=`git symbolic-ref HEAD`; echo ${n##refs/heads/}; }; git push --set-upstream origin `f`"
    rb = rebase origin/@{u}
    ri = rebase --interactive
    rmc = rm --cached
    rpull = pull --rebase
    sfo = show HEAD..FETCH_HEAD
    st = status
    stashed = "!f() { git stash; git $@; git stash pop; }; f"
    wbranch = branch --contains
    wtag = name-rev --name-only
    edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim -p `f`"
[branch]
    autosetupmerge = true
[advice]
    statusHints = false
[diff]
    guitool = gvimdiff
[diff "image"]
    command = imagediff
[difftool]
    prompt = false
[color "decorate"]
    remoteBranch = red
    branch = red bold
    stash = yellow bold
    tag = white bold
[tig]
    tab-size = 4
    show-rev-graph = yes
    show-refs = yes
    commit-encoding = "UTF-8"
    show-author = "abbreviated"
    author-width = 10
    ; line-graphics = "ascii"
[tig "color"]
    date = black default bold
    cursor = white black default

    diff-add = green default bold
    diff-del = red default bold
    diff-header = yellow default bold
    diff-chunk = magenta default bold

    pp-author = cyan default default
    pp-commit = cyan default default
    pp-adate = cyan default default
    pp-cdate = cyan default default

[init]
    templatedir = ~/.git_template
[pretty]
    graphable = %C(yellow)%h%C(red)%d %C(reset)%s %C(green)%an %C(bold black)%cr