[user] name = Michael Campagnaro email = mikecampo@gmail.com [diff] [color] ui = auto [alias] b = branch h = !git head l = !git ll -25 p = push r = reset s = stash x = reset --hard sl = stash list sp = stash pop sd = stash drop sa = stash apply st = status ci = commit cp = cherry-pick co = checkout dc = diff --cached di = diff amend = commit --amend aa = add --all head = !git l -1 hp = "!source ~/.githelpers && show_git_head" re = remote ra = !git r --all ff = merge --ff-only pff = pull --ff-only noff = merge --no-ff la = !git ll --all ll = "!source ~/.githelpers && pretty_git_log" div = divergence gn = goodness gnc = goodness --cached fa = fetch --all pom = push origin master ds = diff --stat=160,120 dh1 = diff HEAD~1 [merge] tool = vimdiff [core] editor = /usr/bin/vim [push] default = tracking