gitconfig

.gitconfig

[core]
  editor = `which vim`
[init]
  templatedir = <%= File.expand_path(File.dirname(__FILE__)) %>/git-template-dir
[merge]
  tool = opendiff
[alias]
  st = status -sb
  co = checkout
  # via http://ozmm.org/posts/git_msg.html
  msg = commit --allow-empty -m
  # Pretty!
  # via http://andyjeffries.co.uk/articles/25-tips-for-intermediate-git-users
  lol = log --pretty=oneline --abbrev-commit --graph --decorate
  unstage = reset HEAD
  done = !git fetch && git rebase origin/master && git checkout master && git merge @{-1} && rake && git push
  up = !git fetch origin && git rebase origin/master
  aa = add .
  # Not yet added - doesn't include ignored files
  new = ls-files --others --exclude-standard
  # Files that are in the staging area
  added = diff --cached --name-only
  today = log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative
  plre = pull --rebase
  ff = merge --ff-only
  newauthor = commit --amend --reset-author -C HEAD
[format]
  # git log uses --pretty format by default, so this changes the default
  # format
  # Now log uses --pretty by default
  # 4436819 [23 hours ago] (Gabe Berke-Williams) One line prompt
  pretty = %C(magenta reverse)%h%Creset %Cgreen[%cr]%Creset (%an) %s
[diff]
  # For Github-style word diffs
  wordRegex = [^[:space:]]
# color the UI!
[color]
  ui = auto
[color "branch"]
  # What colors should "git branch" show?
  #current = yellow reverse # default black
  #local = cyan # default yellow
  #remote = green # default red
[color "diff"]
  # Color syntax: <foreground> <background>
  # So "normal red" is normal foreground, red background
  # BUT bold is a modifier, so "bold green red" means
  #   "bold green" foreground, red background
  whitespace = red reverse
  plain = black
  meta = cyan
  frag = magenta bold
  old = red
  new = green
  commit = yellow
[color "status"]
  # Options:
  # header: the header text of the status message
  # added/updated: added but not committed
  # changed: changed but not added in the index
  # untracked
  # nobranch: the color the "no branch" warning is shown in (default red)
  added = yellow # files deleted with "git rm" are this color too
  changed = green # deleted items NOT done with "git rm" are this color too
  untracked = cyan
[help]
  autocorrect = 1
[svn]
  authorsfile = <%= ENV['HOME'] %>/.git-author
[core]
  whitespace=trailing-space,cr-at-eol
  excludesfile = <%= ENV['HOME'] %>/.gitignore
  autocrlf = input
[achievement]
  upload = true
[instaweb]
  httpd = webrick
[url "git@heroku.com:"]
  insteadOf = heroku:
[url "git://github.com/"]
  # Read-only
  insteadOf = gh:
[url "git@github.com:"]
  # With write access
  insteadOf = wgh:
[push]
  # Push current branch even if you've never pushed it before
  default = current