dotfiles/tilde/gitconfig

[color]
	ui = auto
[color "diff"]
	meta = blue
	frag = white
	old = red bold
	new = green bold
[core]
	editor = vim
	# http://stackoverflow.com/questions/136178/git-diff-handling-long-lines
	# If doesn't work, try: pager = less -+$LESS -FRX
	pager = less -r
	autocrlf = false
	safecrlf = false
	mergeoptions = --no-edit
	excludesfile = ~/.gitignore
[alias]
	a = add
	ua = reset HEAD
	b = branch
	c = commit
	ca = commit -a
	cm = commit -m
	cam = commit -am
	co = checkout
	d = diff --color-words
	s = status -sb
	l = log --graph --pretty=format:'%C(magenta)%h%C(blue)%d%Creset %s %C(blue bold)- %an, %ar%Creset'
	ll = log --stat --abbrev-commit
	conflicts = diff --name-only --diff-filter=U
	commerge = commit --no-edit
[push]
	default = current

# Any GitHub repo with my username should be checked out r/w by default
# http://rentzsch.tumblr.com/post/564806957/public-but-hackable-git-submodules
[url "git@github.com:jacobkiers/"]
	insteadOf = "git://github.com/jacobkiers/"

# URL shorthands
[url "git@github.com:"]
	insteadOf = "gh:"
	pushInsteadOf = "github:"
	pushInsteadOf = "git://github.com/"
[url "git://github.com/"]
	insteadOf = "github:"
[url "git@gist.github.com:"]
	insteadOf = "gst:"
	pushInsteadOf = "gist:"
	pushInsteadOf = "git://gist.github.com/"
[url "git://gist.github.com/"]
	insteadOf = "gist:"

# DiffMerge
[merge]
	tool = diffmerge
[mergetool "diffmerge"]
	cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
	trustExitCode = true
[diff]
	tool = diffmerge
[difftool "diffmerge"]
	cmd = diffmerge $LOCAL $REMOTE

# Include local settings
# Requires Git 1.7.10
# git config -f ~/.gitlocal user.email "jacob@jacobkiers.net"
# git config -f ~/.gitlocal user.name "Jacob Kiers"
[include]
	path = .gitlocal