.gitconfig

.gitconfig

[branch]
  autosetupmerge = true
[user]
	name = Michael Brodhead
  email = [email protected]
[color]
  ui = true
[push]
  default = current

[github]
  user = mkb
  token = acc07f936c49696c01688a9fed0c8313

[core]
  excludesfile = /Users/mkb/.gitignore
	quotepath = false
  autocrlf = input
  whitespace = trailing-space,space-before-tab
[alias]
  amend = commit --amend -C HEAD
  ls = log --oneline --decorate
  co = checkout
	nm = branch --no-merged
[merge]
  tool = kdiff3
[mergetool "extMerge"]
  cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
  trustExitCode = false
[http]
	proxy = http://169.254.66.86:6667