.gitconfig

gistfile1.txt

[user]
	name = Nic Wolff
	email = nwolff@hearst.com
[alias]
	st = status -sb
	pr = pull --rebase
	co = checkout
	back = checkout '@{-2}'
	cb = checkout -b
	br = branch
	cp = cherry-pick
	cm = commit -m
	ci = commit -a -m
	pad = add -p
	mn = merge --no-ff
	dc = diff --cached
	amend = commit -a --amend -C HEAD
	pp = !git pull --rebase && git push
	dw = diff -w
	dww = diff -w --color-words
        up = ! git stash && git checkout master && git fetch && git rebase -p origin/master &&  git checkout '@{-2}' && git rebase master && git stash pop
        up2 = ! git stash && git checkout master && (git pull --rebase | grep 'up to date' && git checkout '@{-1}' || git checkout '@{-2}' ) && git rebase master && git stash pop
	this = ! git init && git add . && git commit -m \"Initial commit\"
	rd = ! git ls-files -z --deleted | xargs -0 git rm
	delete-merged = ! git branch --merged master | grep -v 'master$' | xargs git branch -d
	fp = format-patch
	ml = merge '@{-1}'
	mm = ! git checkout master && git merge '@{-1}'
	lh = ! git log -n 10
        ls = ! sh -c 'git log --no-merges --stat --author=${2:-$USER} --name-only --pretty=format:"" $1^.. | sort -u | sed 1d' -
[format]
	pretty = format:%C(green)%h%Creset %C(cyan)%d%Creset %C(bold yellow)%an%Creset  %s  %C(magenta)%ar%Creset
[diff]
	mnemonicprefix = true
	color-words = true
[color]
	diff = always
	status = auto
	branch = auto
	ui = auto
[color "branch"]
	current = cyan bold
	local = white 
	remote = green
[color "diff"]
	meta = yellow
	frag = cyan
	old = magenta
	new = green
[color "status"]
	added = yellow
	changed = green
	untracked = cyan
[push]
	default = current
[tig]
	show-date = relative
	author-width = 8
	show-rev-graph = no
	tab-size = 4