.gitconfig

[hub]
  protocol = https
[user]
  name = Vasiliy Yorkin
  email = vasiliy.yorkin@gmail.com
[github]
  user = vyorkin
[credential]
  helper = osxkeychain
[alias]
  promote = !$ZSH/bin/git-promote
  wtf     = !$ZSH/bin/git-wtf
  rank-contributers = !$ZSH/bin/git-rank-contributers
  count   = !git shortlog -sn

  a = add                           # add
  aa = add -A
  au = add -u
  chunkyadd = add --patch           # stage commits chunk by chunk

  # branch
  b = branch -v

  # commit
  c = commit -m
  ca = commit -am                   # commit all with message
  ci = commit
  amend = commit --amend

  # checkout
  co = checkout
  nb = checkout -b

  # cherry-pick
  cp = cherry-pick -x               # grab a change from a branch

  # diff
  d = diff
  dc = diff --cached                # diff staged changes
  last = diff HEAD^                 # diff last committed change

  # log
  l = log --graph --date=short
  changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status
  short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\"
  changelog = log --pretty=format:\" * %s\"
  shortnocolor = log --pretty=format:\"%h %cr %cn %s\"

  # pull
  pl = pull
  plp = pull --prune
  up = pull --rebase

  # push
  ps = push
  put = push origin HEAD

  # rebase
  rb = rebase
  ra = rebase --abort
  rc = rebase --continue
  rs = rebase --skip
  ri = rebase --interactive

  # remote
  r = remote -v

  # reset
  unstage = reset HEAD              # remove files from index (tracking)
  uncommit = reset --soft HEAD^     # go back before last commit, with files in uncommitted state
  filelog = log -u                  # show changes to a file
  mt = mergetool                    # fire up the merge tool

  # stash
  ss = stash                        # stash changes
  sl = stash list                   # list stashes
  sa = stash apply                  # apply stash (restore changes)
  sd = stash drop                   # drop stashes (destory changes)
  sp = stash pop

  # status
  s = status -sb
  sl = status

  # tag
  t = tag -n

  # svn helpers
  svnr = svn rebase
  svnd = svn dcommit
  svnl = svn log --oneline --show-commit

  st = !open -a SourceTree .
	ctags = !.git/hooks/ctags
[format]
  pretty = format:%C(magenta)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(white)%s %C(red) [%an]%Creset
[mergetool]
  prompt = false
[mergetool "mvimdiff"]
  cmd="mvim -c 'Gdiff' $MERGED"
  keepbackup=false
[merge]
  summary = true
  verbosity = 1
  tool = mvimdiff
[diff]
  mnemonicprefix = true
[color]
  diff = auto
  status = auto
  branch = auto
  ui = true
[core]
  autocrlf = false
  excludesfile = /Users/vyorkin/.gitignore
  editor = vim
[advice]
  statusHints = false
[apply]
  whitespace = nowarn
[mergetool]
  keepBackup = false
[difftool]
  prompt = false
[rerere]
  enabled = false
[help]
  autocorrect = 1
[difftool "sourcetree"]
  cmd = opendiff \"$LOCAL\" \"$REMOTE\"
  path =
[mergetool "sourcetree"]
  cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
  trustExitCode = true
[filter "media"]
	clean = git-media-clean %f
	smudge = git-media-smudge %f
[log]
	decorate = short
[init]
	templatedir = ~/.git_template