.gitconfig

[user]
	name = Mauricio Voto
	email = mauriciovoto@gmail.com
[core]
	excludesfile = /Users/mvoto/.gitignore_global
	editor = /usr/bin/vim
[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
[color]
	branch = auto
	diff = auto
	interactive = auto
	status = auto
[github]
	user = mvoto
	email = mauriciovoto@gmail.com
[push]
  default = simple
[alias]
  a = add
  s = status
  c = commit -v
  ca = commit -v --amend
  b = branch
  m = merge
  mc = merge --no-ff --commit
  r = rebase
  rc = rebase --continue
  ra = rebase --abort
  rs = rebase --skip
  p = push
  pu = push --set-upstream origin
  pff = pull --ff-only
  f = fetch
  d = diff --color-words -w
  ds = diff --color-words -w --staged
  l = log -p
  co = checkout
  fix = commit --amend -C HEAD
  rs = remote show
  ls = ls-files
  sl = shortlog -sn
  rom = rebase origin/master -s recursive -X theirs
  st = status