Permalink
Find file
Fetching contributors…
Cannot retrieve contributors at this time
44 lines (43 sloc) 1.35 KB
# ADD LOCAL CONFIGURATION HERE
[user]
name = Steve Hickey
email = steve@stevehickeydesign.com
[branch "master"]
rebase = true
[remote "origin"]
push = HEAD
# DO NOT EDIT BELOW THIS LINE
[push]
default = current
[color]
diff = auto
status = auto
branch = auto
[core]
excludesfile = ~/.gitignore
[format]
pretty = %Cblue%h%Creset %Cgreen[%cr]%Creset (%an) %s
[alias]
c = commit -m
a = add
aa= !git add -u && git add . && git status
di = diff
dic = diff --cached
pl = pull
ps = push
plre = pull --rebase
st = status
out = log origin..HEAD
qpl = log --pretty=\"%Cblue%h%Creset %Cgreen[%cr]%Creset %s\" origin/production..origin/master
graph = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
ci = commit
ca = commit --amend -C HEAD
cleanup = !git remote prune origin && git gc && git clean -dfx && git stash clear
up = !git fetch origin && git rebase origin/master
done = !git fetch && git rebase origin/master && git checkout master && git merge @{-1} && rake && git push
down = !git fetch && git rebase origin/master && git checkout master && git merge @{-1} && rake && git push
ir = !git rebase -i origin/master
who = shortlog -n -s --no-merges
unfuck = reset --hard HEAD
cob = checkout -b
rmb = !sh -c 'git branch -D $1 && git push origin :$1' -