[core] #whitespace = blank-at-eol,tab-in-indent,space-before-tab,trailing-space,tabwidth=4 preloadindex = true [color] diff = yes ui = yes [alias] br = branch ci = commit co = checkout st = status dc = diff --check brm = !git br -a | grep -e master -e $USER -e review/ -e releases/ #branch-name = !git branch | awk '/\\*/{print $2}' branch-name = branch --show-current sd = diff --name-status last = cat-file commit HEAD trim = "!f() { git fetch --all --prune; git branch -vv | awk '/: gone]/{print $1}' | xargs git branch -D; }; f" [color "branch"] current = bold blue [color "status"] updated = bold blue [color "diff"] new = bold blue [merge] conflictstyle = diff3 mergetool = vimdiff tool = vimdiff # Merge commit setup log = 50 branchdesc = true suppressDest= [push] default = upstream [log] showsignature = true indentheuristic = true [diff] indentheuristic = true [pull] rebase = false # Don't break old scripts [init] defaultBranch = master # # vim: ft=gitconfig #