gitconfig

[user]
	name = Scott Raymond
	email = scott.raymond@airbnb.com
[credential]
	helper = osxkeychain
[github]
  user = sco
  token = REDACTED
#[heroku]
#	account = personal
[color]
  status = auto
  diff = auto
  branch = auto
  interactive = auto
  ui = auto
[color "branch"]
  current = yellow reverse
  local = yellow
  remote = green
[color "diff"]
  meta = yellow bold
  frag = magenta bold
  old = red bold
  new = green bold
[color "status"]
  added = yellow
  changed = green
  untracked = cyan
[alias]
  br = branch -v    # show branches verbosely
  st = status
  ci = commit
  cp = cherry-pick
  amend = commit --amend
  co = checkout
  nb = checkout -b  # create and switch to a new branch
  plre = pull --rebase
  pom = push origin master

  # rebase
  rc = rebase --continue            # continue rebase
  refuck = rebase   # for the lulz

  # diff
  df = diff
  staged = diff --cached
  unstaged = diff
  last = diff HEAD^ # diff last committed change
  both = diff HEAD

  # reset
  undo = reset --soft HEAD^
  unstage = reset HEAD

  # log
  lg = log -p
  logline = log --pretty=oneline
  today = log --since='1 Day Ago'
  recent = log --stat --since='3 Hours Ago' --graph --pretty=oneline --abbrev-commit --date=relative
  me = log --author='Scott Raymond'

  # automatically commit change and pre-configure the rebase prompt to fold it into the last commit
  fix = "!f() { git commit -a -m \"fixup! $(git log -1 --pretty=format:%s)\" && git rebase -i --autosquash HEAD~4; }; f"
[format]
  # git log uses --pretty format by default, so this changes the default
  # e.g. 4436819 [23 hours ago] (Gabe Berke-Williams) One line prompt
  #pretty = %C(yellow)%h%Creset %Cgreen[%cr]%Creset (%an) %s
[merge]
  tool = opendiff
[merge "pofile"]
  name = Gettext merge driver
  driver = git merge-po %O %A %B
#[sendemail]
#  smtpserver = smtp.example.com
#  aliasesfile = /Users/matt/.gitaliases
#  aliasfiletype = mailrc
[core]
#  legacyheaders = false
#  excludesfile = /Users/matt/.gitignore
  editor = vim
	trustctime = false
[repack]
  usedeltabaseoffset = true
[apply]
  whitespace = nowarn
[push]
  # push current branch even if you've never pushed it before
  default = current
[rerere]
  enabled = 1
[mergetool]
	keepBackup = false
[filter "media"]
	clean = git-media-clean %f
	smudge = git-media-smudge %f