gistfile1.txt

[alias]
	co = checkout
	b = branch
[branch]
	autosetupmerge = true
[user]
	email = shhh@shhcom
	name = Tim Harper
[gui]
	matchtrackingbranch = true
	pruneduringfetch = true
	fontui = -family Tahoma -size 13 -weight normal -slant roman -underline 0 -overstrike 0
	recentrepo = /Users/timcharper/www/market
[color]
	status = auto
	branch = auto
	diff = auto
[sendemail]
	smtpserver = /opt/local/bin/msmtp
[log]
[git-tmbundle "log"]
	context-lines = 10
[apply]
  whitespace = nowarn
[git-tmbundle]

[push]
  default = current
[mergetool "diffmerge"]
	cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
	trustExitCode = false