Git Configuration

mac.gitconfig

[user]
	name = Chris Patterson
	email = chris@phatboyg.com
[core]
	autocrlf = false

[alias]
    ci = commit
    undo = reset --hard
    up = pull origin master
    upb = pull origin
    upd = pull origin develop
    unci = reset --soft HEAD~
    adp = add -p
    st = status
    ad = add --all .
    to = push origin master
    tob = push origin
    tod = push origin develop
    lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
    unk = ls-files . --ignored --exclude-standard --others
    unt = ls-files . --exclude-standard --others
    cob = checkout -b

[diff]
	keepBackup = false
	tool = kdiff3

[mergetool "p4merge"]
	cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
	keepTemporaries = false
	trustExitCode = false
	keepBackup = false

[diff]
	external = p4diff

win.gitconfig

[user]
  name = Chris Patterson
  email = chris@phatboyg.com
[merge]
  tool = kdiff3
[mergetool "kdiff3"]
  path = C:/Program Files (x86)/KDiff3/KDiff3.exe
[branch]
  autosetupmerge = true
[core]
  autocrlf = false
  editor = c:/Program Files/Sublime Text 2/sublime_text.exe -n
[alias]
  ci = commit
  undo = reset --hard
  up = pull origin master
  upd = pull origin develop
  upb = pull origin
  st = status
  ad = add --all .
  to = push origin master
  tod = push origin develop
  tob = push origin
  lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
  unk = ls-files . --ignored --exclude-standard --others
  unt = ls-files . --exclude-standard --others
  cob = checkout -b
  gpp = pull --rebase && git push
  gmf = merge --ff-only
  gap = add --patch
  fo = fetch origin
  rod = rebase origin/develop
  rom = rebase origin/master
  com = checkout master
  cod = checkout develop
  too = push org master
  tood = push org develop
	csv = checkout
[color]
  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
[color "diff"]
  whitespace = red reverse
[core]
  whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
[mergetool]
  keepBackup = false