gitconfig

[user]
	name = Alex Paulson
	email = whileforkdofork@gmail.com
[push]
	default = simple
[color]
	ui = auto
	status = auto
	branch = auto
	diff = auto
[diff]
	tool = nvim -d
[merge]
	tool = fugitive
[mergetool "fugitive"]
	cmd = nvim -f -c \"Gdiff\" \"$MERGED\"
[mergetool]
	prompt = false
[core]
	editor = nvim
	whitespace = cr-at-eol
	excludesfile = ~/.gitignore_global
; [mergetool "vimdiff3"]
; 	cmd = vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"

[alias]
# From http://www.codedevelopr.com/
	zip = "!zipArchive() { git archive --format zip --output $1 $2; }; zipArchive"
	tgz = "!zipArchive() { git archive --format tgz --output $1 $2; }; zipArchive"
	bra = branch -vva
	la = log --pretty=format:'%C(yellow)%h%Creset %C(bold green)%an%Creset %Cblue%ad%Creset %s' --date=short
	lan = log --pretty=format:'%C(yellow)%h%Creset %C(bold green)%an%Creset %Cblue%ad%Creset %s' --date=short ORIG_HEAD..HEAD
	new = log --oneline --no-decorate --name-status --no-merges ORIG_HEAD..HEAD
	sync = !git pull && git push
	ls = ls-files
[help]
	autocorrect = 1
[status]
	showUntrackedFiles = all
[pull]
	rebase = true
[github]
	user = ajpaulson
[rebase]
	autostash = true