[user] name = Michael Campagnaro email = mikecampo@gmail.com [merge] summary = true tool = vimdiff [core] editor = /usr/bin/vim [push] default = tracking [github] user = mikecampo [diff] algorithm = patience [color] diff = auto status = auto branch = auto interactive = auto ui = true pager = true [color "branch"] current = yellow reverse local = yellow remote = green [color "diff"] meta = blue frag = magenta old = red new = green [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 -s -b ci = commit cp = cherry-pick co = checkout d = diff dc = diff --cached ds = diff --staged dw = diff --color-words ae = 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 snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}" ours = "!f() { git checkout --ours $@ && git add $@; }; f" theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"