.gitconfig

[user]
	name = Kevin Baker
	email = kevin.baker@improving.com

[core]
	excludesfile = /Users/kevinbaker/.gitignore_global
	editor = atom --wait

# sourcetree
[difftool "sourcetree"]
	cmd = /usr/local/bin/ksdiff -- \"$LOCAL\" \"$REMOTE\"
	path = 

[mergetool "sourcetree"]
	cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" \"$REMOTE\"
	trustExitCode = true

# Kaleidoscope
[difftool "Kaleidoscope"]
  cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"

[mergetool "Kaleidoscope"]
  cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
  trustExitCode = true

[diff]
  tool = Kaleidoscope

[difftool]
  prompt = false

[mergetool]
  prompt = false

[merge]
  tool = Kaleidoscope

[color]
	ui = true

[push]
	default = current

[alias]
	# Snagged from Ryan Tomayko (http://github.com/rtomayko/dotfiles)
	# commit
	ci = commit --verbose
	cn = commit --verbose --amend
	ca = commit --verbose --all
	cw = commit -am "WIP"
	cm = commit -am
	cc = commit -c

	# branch
	b = branch

	# add
	a = add
	aa = add --update
	ap = add --patch

	# checkout
	c = checkout

	# fetch
	f = fetch

	# pull
	pr = pull --rebase

	#push
	pom = push origin master

	# rebase
	r = rebase --interactive HEAD~10
	rc = rebase --continue
	ra = rebase --abort

	# diff
	d = diff
	p = diff --cached # mnemonic: "patch"
	ds = diff --stat # mnemonic: "diff stat"
	dt = difftool --no-prompt

	# status
	s = -p status # with pagination
	ss = -p status -s
  
	# TFS
	tpr = tf pull --rebase --deep
	tcd = tf checkin --deep

	# log
	l = log --pretty=oneline --abbrev-commit
	ll = log --pretty=oneline --abbrev-commit --max-count=15
	lc = log --stat --summary
	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative 
	lga = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all

	# log - standup
	standup = log --pretty=format:'%Cgreen(%cr)%Creset %s' --since="yesterday" --author=Kevin
	standup2 = log --pretty=format:'%Cgreen(%cr)%Creset %s' --since=2.days.ago --author=Kevin
	weekreview = log --pretty=format:'%Cgreen(%cr)%Creset %s' --since=last.sunday --author=Kevin

	# clean
	prune = fetch --prune

	# misc
	pi = cherry-pick
	ki = stash --keep-index

	# experimental
	force-nice = --force-with-lease
	stage = add
	unstage = reset HEAD
	pop = reset --soft HEAD^
	review = log -p --max-count=1
	rv = remote -v
	fp = format-patch --stdout