gitconfig

[user]
  name = Stephen Hicks
  email = stephenhicks@gmail.com

[alias]
  changes = log --color --graph --decorate
  co = checkout
  cod = checkout --detach
  b = branch
  amend = commit --amend -C HEAD
  s = status
  statys = status
  statis = status
  untracked = git ls-files --others --exclude-standard
  # TODO(sdh): this fails if master doesn't have 2 parents, and misses any extras
  #   - figure out a way to say "all" direct parents? - could use a script
  #   - note that this causes gaps in the tree, making things confusing.
  xx = log --color --graph --decorate --not master^ master^2 --not --branches --oneline

[color]
  ui = auto

[core]
  excludesfile = ~/.gitignore_global

[init]
  templatedir = ~/.gitconfig.d/templates

[rerere]
  # TODO(sdh): figure out if/how we want to use this...
  enabled = true
  autoupdate = true

[merge]
  conflictstyle = diff3

[merge "keep"]
  # Custom merge tool allowing to tag lines with MERGE:preserve
  driver = git-merge-keep "%A" "%O" "%B"

[http]
  cookiefile = ~/.gitcookies
[pull]
	rebase = false