[user]
	name = Mikel Ward
	email = mikel@mikelward.com

[alias]
    ad = add
    br = branch
    changes=diff --name-status -r
    ci = commit
    co = checkout
    cp = cherry-pick
    cs = commit --signoff
    dc = diff --cached
    df = diff
    di = diff
    diffstat = diff --stat -r
    ds = diff --stat -r
    last = log -1
    #lg = log --graph --pretty=oneline --abbrev-commit --decorate
    #lo = log
    llog = log --date=local
    logg = log --graph --pretty=oneline --abbrev-commit --decorate
    #mr = merge
    #revert = ???checkout -f HEAD???
    #rs = reset
    st = status
    stat = status
    stage = add --update
    staged = diff --cached
    track = add --intent-to-add
    unadd = reset HEAD
    untrack = rm --cached
    who = shortlog -s --
    unstage = reset HEAD

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

[svn]
    authorsfile = /home/mikel/.gitauthors