.gitconfig

[alias]
	co = checkout
	d = diff
	ds = diff --stat
	# Logging aliases:
	l = log --graph --date=format:%c --pretty=format:'%C(auto)%h%d %s%C(reset)  %C(green)\"%an\" <%ae>%C(reset) %C(cyan)%ar (%ad)%C(reset)'
	la = log --graph --date=format:%c --pretty=format:'%C(auto)%h%d %s%C(reset)  %C(green)\"%an\" <%ae>%C(reset) %C(cyan)%ar (%ad)%C(reset)' --all
	ls = log --graph --date=format:%c --pretty=format:'%C(auto)%h%d %s%C(reset)  %C(green)\"%an\" <%ae>%C(reset) %C(cyan)%ar (%ad)%C(reset)' --simplify-by-decoration
	las = log --graph --date=format:%c --pretty=format:'%C(auto)%h%d %s%C(reset)  %C(green)\"%an\" <%ae>%C(reset) %C(cyan)%ar (%ad)%C(reset)' --all --simplify-by-decoration
	# Other useful aliases:
	unstage = reset HEAD
	staged = diff --staged
	cached = diff --cached
	unstaged = diff
	current-branch = !git symbolic-ref -q HEAD | sed -e 's|^refs/heads/||'
	cleanse = !git branch -vv | grep ': gone]' | awk '{print $1}' | xargs -n 1 git branch -D
	update = "! \
	    CURRENT_BRANCH=`git current-branch`; \
	    echo \"Current branch is $CURRENT_BRANCH\"; \
	    git co -b dummy_branch 2> /dev/null; \
	    for branch in `git branch -vv | egrep ': behind \\d*\\]' | awk '{print $1}'`; \
	    do \
	        git checkout $branch; \
	        git merge --ff-only origin/$branch; \
	    done; \
	    git checkout $CURRENT_BRANCH; \
	    git branch -d dummy_branch 2> /dev/null; \
	"
	vrm = !git tag -l | gsort -V
	vv = branch -vv
	dag = log --graph --format='format:%C(yellow)%h%C(reset) %C(blue)\"%an\" <%ae>%C(reset) %C(magenta)%cr%C(reset)%C(auto)%d%C(reset)%n%s' --date-order
[apply]
	whitespace = warn
[clean]
	requireForce = false
[color]
	ui = auto
[color "diff"]
	meta = cyan bold
	frag = magenta bold
[color "status"]
	added = green
	changed = yellow
	untracked = red
[core]
	excludesfile = /Users/gjake/.gitignore_global
	autocrlf = input
	pager = less -FMRiX
	whitespace = tab-in-indent
[diff]
	tool = idea
[difftool "idea"]
	cmd = /usr/local/bin/idea diff \"$LOCAL\" \"$REMOTE\"
[fetch]
	prune = true
[help]
	autocorrect = -1
[log]
	decorate = short
[merge]
	tool = idea
	conflictStyle = diff3
[mergetool "idea"]
	cmd = /usr/local/bin/idea merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
	trustExitCode = false
[pull]
	ff = only
	rebase = true
[push]
	default = simple
[remote "origin"]
	push = HEAD
[status]
	submodule = 1
[user]
	name = Jake Griffin
	email = gjake@amazon.com
[credential]
	helper = osxkeychain
[rerere]
	enabled = true
[commit]
	template = /Users/gjake/.git-commit-template.txt
	cleanup = strip