[user]
	name = Dan Buch
	email = daniel.buch@gmail.com

[github]
	user = meatballhat

[core]
	excludesfile = ~/.git-global-ignores
	editor = vim
	filemode = true
	autocrlf = false
	pager = less -FRX

[clean]
	requireForce = false

[branch]
	autosetuprebase = remote
	autosetupmerge = true
	mergeoptions = --no-commit --no-ff

[daemon]
	uploadpack = true
	uploadarch = true
	receivepack = true

[push]
	default = current

[color]
	ui = auto

[color "branch"]
	current = yellow reverse
	local = yellow
	remote = green

[color "diff"]
	meta = yellow bold
	frag = magenta bold
	old = red bold
	new = green bold

[color "status"]
	added = yellow
	changed = green
	untracked = cyan

[alias]
	a = add
	ad = add
	addd = add
	br = branch
	bra = branch -a
	brr = branch -r
	ci = commit
	co = checkout
	d = diff
	dc = diff --cached
	di = diff
	dif = diff
	l = ls-files
	ls = ls-files
	nuke = clean -dfx
	pr = pull --rebase
	s = status --short
	st = status
	sta = stash
	stcq = diff --cached --name-only
	stq = diff --name-only
	t = tag
	ta = tag
	tags = tag

	slog = log git-svn..
	sup = svn fetch --all
	spush = svn dcommit
	srb = rebase git-svn

	rpo = remote prune origin

	cm = checkout master
	lm = log master..

	rt = rebase trunk
	lt = log trunk..
	ct = checkout svn/trunk

	logv = log --name-status

# vim: set filetype=cfg noexpandtab:
[commit]
	template = /Users/me/.gittemplate