[user]
name = Chris Patterson
email = ###
[merge]
tool = kdiff3
[mergetool "kdiff3"]
path = C:/Program Files/KDiff3/KDiff3.exe
[branch]
autosetupmerge = true
[core]
autocrlf = false
editor = 'C:\\Program Files\\Sublime Text 2\\sublime_text.exe' -w
[alias]
alias = !"git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1\\t=> \\2/' | sort"
snapshot = !git stash save "Snapshot on $(date)" && git stash apply "stash@{0}"
ci = commit
undo = reset --hard
fuckit = !"a6() { git fetch origin; git reset --hard origin/$1; }; a6"
up = pull origin master
upd = pull origin develop
upb = pull origin
history = log --oneline --decorate --graph
st = status
rv = remote -v
ad = add --all .
to = push origin master
tod = push origin develop
tob = push origin
unci = reset --soft HEAD~
lg = log --graph --decorate --pretty=format:'%C(yellow bold)%h%Creset -%C(magenta bold)%d%Creset %s %C(green bold)(%cr) %C(cyan bold)<%an>%Creset' --abbrev-commit --date=relative
unk = ls-files . --ignored --exclude-standard --others
unt = ls-files . --exclude-standard --others
ignore = update-index --assume-unchanged
cob = checkout -b
co = checkout
gpp = pull --rebase && git push
gmf = merge --ff-only
rebi = !"a3() { git rebase -i HEAD~$1; }; a3"
dfo = !"a4() { git fetch origin; git diff --patch origin/$1 $1; }; a4"
dfoo = !"a5() { git fetch org; git diff --patch org/$1 $1; }; a5"
gap = add --patch
fo = fetch origin
foo = fetch org
rod = rebase origin/develop
frod = !"git fetch origin && git rebase origin/develop"
rood = rebase org/develop
frood = !"git fetch org && git rebase org/develop"
rom = rebase origin/master
from = !"git fetch origin && git rebase origin/master"
room = rebase org/master
froom = !"git fetch org && git rebase org/master"
com = checkout master
cod = checkout develop
too = push org master
tood = push org develop
csv = checkout
[color]
ui = auto
[color "branch"]
current = yellow bold
local = green bold
remote = magenta bold
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "status"]
added = cyan bold
updated = green bold
changed = red bold
untracked = magenta bold
branch = yellow bold
[core]
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol,tabwidth=4
[mergetool]
keepBackup = false
[credential]
helper = winstore
[pull]
rebase = true