.gitconfig

[user]
  email = [email protected]
  name = Wesley Schleumer
[svn]
  rmdir = true
[core]
  compression = 0
  excludesfile = ~/.gitignore
  packedGitLimit = 2047m
  packedGitWindowSize = 2047m
[pack]
  deltaCacheSize = 2047m
  packSizeLimit = 2047m
  windowMemory = 2047m
[http]
  postBuffer = 524288000
[ssh]
  postBuffer = 524288000
[alias]
  branch-name = "!git rev-parse --abbrev-ref HEAD"
  st = status
  pub = "!git push -u origin $(git branch-name)"
  sub = "!git pull origin $(git branch-name)"
  lu = ls-files -o --exclude-standard

  # Checkout our version of a file and add it
  ours = "!f() { git checkout --ours $@ && git add $@; }; f"
  # Checkout their version of a file and add it
  theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
  c = "!f() { echo adding all files; git add -A; echo commiting $(git rev-parse --abbrev-ref HEAD); git commit -a -m $(git rev-parse --abbrev-ref HEAD); }; f"
[merge]
  tool = meld