gitconfig

[credential]
#	helper = osxkeychain

[core]
	excludesfile = /opt/boxen/config/git/gitignore

[hub]
  protocol = https

[user]
	name = Adam Crews
	email = adamc@slalom.com

[push]
	default = simple

[color]
	ui = always

[merge]
#	ff = false

[alias]
  pu = !"git fetch origin -v; git pull --rebase upstream master"
  #pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master --ff-only"
  lg = !"git log --pretty=format:'%C(yellow)%h%C(reset) %C(blue)%an%C(reset) %C(cyan)%cr%C(reset) %s %C(green)%d%C(reset)' --graph --date-order"
[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
[http]
	sslVerify = true