gitconfig

[core]
editor = vim
#autocrlf = true
	excludesfile = /home/mphillips/.gitignore_global
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol

[user]
name = Matt Phillips
#email = mattp@cpan.org
email = mphillips@oanda.com

[branch]
autosetuprebase = always

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

[color "branch"]
current = yellow reverse
local = yellow
remote = green

[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse

[color "status"]
added = yellow
changed = green
untracked = cyan

[remote "origin"]
fetch=+refs/pull/*/head:refs/remotes/pull-request/*

[branch "develop"]
remote = origin
merge = develop

[diff]
tool = vimdiff -c 'TlistClose'
#tool = vimdiff
prompt = false

[alias]
slog = log --pretty=format:\"%h %s\" --graph
flog = log --stat --abbrev-commit --relative-date --pretty=oneline
plog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
sdiff = diff --pretty=format:\"%h %s\" --graph
fdiff = diff --stat --abbrev-commit --relative-date --pretty=oneline
pdiff = diff --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
ls = ls-files
find = !git ls-files |ag
vim = !sh -c 'vim `git ls-files | ack -i $0 | head -1`'
heads = !"git log origin/master.. --format='%Cred%h%Creset;%C(yellow)%an%Creset;%H;%Cblue%f%Creset' | git name-rev --stdin --branch --always --name-only | column -t -s';'"
feature = flow feature
release = flow release
hotfix = flow hotfix
st = status
ci = commit --verbose
a = add
cia = commit --amend
co = checkout
br = branch
sb = show-branch
cp = cherry-pick
staged = diff --cached
rb = rebase
rbc = rebase --continue
rbs = rebase --skip
rl = reflog
rs = remote show
rt = remote
ru = remote update
rp = remote prune
sm = submodule
pu  = pull --ff-only --rebase