gitconfig

# set machine specific user in .gitconfig.local
[user]
  name = Andrew Roberts
  email = adroberts@gmail.com
[color]
  diff = auto
  status = auto
  branch = auto
  ui = auto
[core]
  excludesfile = ~/.gitignore
[alias]
  c = commit -m
  ca = commit --amend
  can = commit --amend --no-edit
  cp = cherry-pick
  co = checkout
  com = checkout master
  rbc = !git rebase --continue && git status
  rbac = !git add . && git rebase --continue && git status
  rbi = !git fetch origin && git rebase -i origin/master
  caall = !git add -A && git commit -m
  ap = add --patch
  a = add
  di = diff
  dic = diff --cached
  pl = pull
  plre = pull --rebase
  st = status
  mst = multi-status ..
  unpushed = log HEAD..origin
  branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes
  incoming = !sh -c 'git fetch && git whatchanged -p ..origin'
  authorlist = !sh -c 'git log --format="%aN" --reverse | sort | uniq'
  glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
  topo = log --graph --simplify-by-decoration --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all
  topo-local = log --graph --simplify-by-decoration --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all --decorate-refs=refs/heads/
  la = log --pretty=\"format:%ad %h (%an): %s\" --date=short
  lc = log ORIG_HEAD.. --stat --no-merges
  cancel = reset --soft HEAD^
  changes = diff --name-stats -r
  diffstat = diff --stat -r
  new = !sh -c 'git log $1@{1}..$1@{0} "$@"'
  aliases = !sh -c 'git config --list | grep "^alias" | sed "s/^alias\\.//"'
  sweep = "!git branch --merged | grep  -v '\\*\\|master\\|develop' | xargs -n 1 git branch -d"
  up = !git fetch origin && git rebase origin/master
  cpr = !hub pull-request
  sh = !sh -c 'gitsh --git $(which hub)'
  conflicts = !sh -c 'git ls-files --unmerged | cut -f2 | uniq'
  sup = !sh -c 'git submodule init && git submodule update'
  pushall = "!git remote | xargs -n 1 git push"
[github]
  user = aroberts
[push]
  default = simple
  autoSetupRemote = true
  followTags = true
[diff]
  compactionHeuristic = 1
  algorithm = histogram
  colorMoved = plain
  mnemonicPrefix = true
[merge]
  conflictstyle = zdiff3
[branch]
  sort = -committerdate
[tag]
  sort = version:refname
[pager]
  log = diff-highlight | less
  show = diff-highlight | less
  diff = diff-highlight | less
[commit]
  verbose = true
[fetch]
  prune = true
  pruneTags = true
  all = true
[mergetool]
  keepBackup = false
[include]
  path = ~/.gitconfig.local
[rebase]
  autosquash = true
  autostash = true
  updateRefs = true
[pull]
  rebase = false
[help]
	autocorrect = 0
[init]
  defaultBranch = master

# [filter "ansible-vault"]
#   smudge = /Users/aroberts/bin/vault-git-tool smudge
#   clean = /Users/aroberts/bin/vault-git-tool clean
#   required
# [diff "ansible-vault"]
#   textconv = /Users/aroberts/bin/vault-git-tool clean





[include]
    # Includes a file relative to the location of the current config file
    path = .gitconfig-local