gitconfig

# ~/.gitconfig_local template
#
# [user]
#   email =
#   name =
# [github]
#   user =

[include]
  path = ~/.gitconfig_local
[alias]
  co = checkout
  cp = cherry-pick
  st = status
  br = branch
  w = whatchanged
  amend = commit --amend
  unstage = reset HEAD --
  # https://stackoverflow.com/a/30998048/8985
  find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"
  show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'"
[apply]
  whitespace = nowarn
[color]
  diff = auto
  status = auto
  branch = auto
  interactive = auto
  ui = true
  pager = true
[merge]
  summary = true
[push]
  default = upstream
[diff]
  ignoresubmodules = untracked
  compactionHeuristic = true
[core]
  excludesfile = ~/.gitignore
[heroku]
  account = personal
[pull]
  rebase = true
[fetch]
  prune = true
[submodule]
  fetchJobs = 4
[gpg]
  program = gpg1
[pager]
  branch = false