[user] name = Michael Campagnaro email = mikecampo@gmail.com [diff] [color] ui = auto [alias] p = push st = status ci = commit co = checkout di = diff dc = diff --cached amend = commit --amend aa = add --all head = !git l -1 h = !git head hp = "!source ~/.githelpers && show_git_head" r = !git l -20 re = remote ra = !git r --all ff = merge --ff-only pullff = pull --ff-only noff = merge --no-ff l = "!source ~/.githelpers && pretty_git_log" la = !git l --all div = divergence gn = goodness gnc = goodness --cached fa = fetch --all pom = push origin master b = branch ds = diff --stat=160,120 dh1 = diff HEAD~1 [merge] tool = vimdiff