This is my gitconfig; please consider it a useful reference. May be slightly out of date but generally current.

.gitconfig

[user]
	name = Ryan McKern
	email = ryan.mckern@puppetlabs.com

[color]
	diff = auto
	status = auto
	branch = auto
	ui = auto

[core]
	quotepath = false
	excludesfile = /Users/mckern/.gitignore_global
	pager =

[push]
	default = simple

[alias]
	amend = commit --amend
	authors = !git log --format='%aN' | sort -u
	branches = branch --all
	branchname = rev-parse --abbrev-ref HEAD
	ci = commit
	co = checkout
	files = show --pretty="format:" --name-only
	fix-email-puppet = commit --amend --author=\"Ryan McKern <ryan.mckern@puppetlabs.com>\"
	fix-orangefort-address = commit --amend --author=\"Ryan McKern <ryan@orangefort.com>\"
	force = push --force
	lastlog = log -n1
	oneline = log --pretty=oneline
	orangefort = config user.email \"ryan@orangefort.com\"
	origin = remote add origin
	pop = stash pop
	puppetlabs = config user.email \"ryan.mckern@puppetlabs.com\"
	puppet = config user.email \"ryan.mckern@puppet.com\"
	remotes = remote -v
	rename = mv
	sync = "!git fetch; git checkout master; git pull"
	unstage = reset HEAD
	upstream = remote add upstream
	whoami = config user.email
	ffs = clean -ffdx

[diff]
	tool = ksdiff
[mergetool "ksdiff"]
	cmd = ksdiff --merge --output \"${MERGED}\" --base \"${BASE}\" -- \"${LOCAL}\" --snapshot \"${REMOTE}\" --snapshot
	trustExitCode = true
[mergetool]
	prompt = false
[merge]
	tool = ksdiff
[difftool]
	prompt = false
[difftool "ksdiff"]
	cmd = ksdiff --partial-changeset --relative-path \"${MERGED}\" -- \"${LOCAL}\" \"${REMOTE}\"
[credential]
	helper = osxkeychain
[filter "lfs"]
	clean = git-lfs clean %f
	smudge = git-lfs smudge %f
	required = true