[diff] [color] ui = auto [alias] st = status bi = bisect ci = commit co = checkout di = diff dc = diff --cached amend = commit --amend aa = add --all ff = merge --ff-only pullff = pull --ff-only noff = merge --no-ff 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 head = !git l -1 h = !git head hp = "!source ~/.githelpers && show_git_head" r = !git l -30 ra = !git r --all l = "!source ~/.githelpers && pretty_git_log" la = !git l --all sync = "!source ~/.githelpers && sync_to_remote" bsync = "!source ~/.githelpers && update_branch" bp = !git backport backport = "!source ~/.githelpers && backport_pr" todo = grep --heading --break --ignore-case -e ' FIX: *' -e ' TODO: *' pr = "!source ~/.githelpers && get_pr" prd = "!source ~/.githelpers && del_pr" brc = "!source ~/.githelpers && clean_branches" [merge] tool = vimdiff ff = true [push] default = current [branch] autosetuprebase = always