gitconfig

[core]
    ;filemode = false
[color]
	diff = auto
	status = auto
	branch = auto
[alias]
    ass = update-index --assume-unchanged
    unass = update-index --no-assume-unchanged
    m = merge
    st = status -sb
    ci = commit
    ca = commit --amend
    br = branch
    brnp = --no-pager branch
    cp = cherry-pick
    co = checkout
    cl = clone
    rb = rebase
    pr = pull --rebase
    diff = diff --word-diff
    dc = diff --cached
    df = diff
    lol = log --graph --decorate --pretty=oneline --abbrev-commit --all
    ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
    le = log --oneline --decorate
    ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
    ld = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
    lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
    lds = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
    filelog = log -u
    fl = log -u
    conflicts = !git ls-files -u | cut -f 2 | sort -u
    sup = !git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD`
    usemnsid = config user.email "aaron@muscleandstrength.com"

[user]
	name = Aaron Bonner
	email = ajbonner@gmail.com
[github]
    user = ajbonner
[push]
	default = tracking
[core]
    symlinks = true
    preloadindex = true
    editor = /usr/local/bin/vim
[merge]
    ff = only
[pull]
	rebase = true
[init]
	defaultBranch = master