Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Fetching contributors…

Cannot retrieve contributors at this time

65 lines (64 sloc) 2.727 kb
[user]
name = Jon Yurek
email = jyurek@thoughtbot.com
[color]
branch = true
diff = true
interactive = true
pager = true
status = true
[alias]
st = status -sb
co = checkout
c = commit -v
a = !git add -A && git status
ac = !sh -c 'git add -A && git commit -v '
acm = !git add -A && git commit -vm
wip = !sh -c 'git add -A && git commit -m wip'
staged = diff --cached
unstaged = diff
both = diff HEAD
oneline = log --pretty=oneline
amend = commit --amend
cs = commit --amend -C HEAD
ch = cherry -v
plre = pull --rebase
rem = rebase master
pick = cherry-pick
child-of = !sh -c '([[ $(git merge-base $1 $0) == $(git log -n 1 --format="%H" $0) ]] && echo "$0 is a child of $1") || echo "$0 is not a child of $1"'
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cblue%an%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
publish = !sh -c 'git push origin \"$0\" && git config \"branch.$0.remote\" origin && git config \"branch.$0.merge\" \"refs/heads/$0\"'
track = !sh -c 'git config \"branch.$1.remote\" $0 && git config \"branch.$1.merge\" \"refs/heads/$1\"'
l = log --name-status --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cblue%an%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
can-ff = !sh -c 'git merge-base $(git show-ref --hash $(git branch | grep '*' | cut -d ' ' -f 2)) $(git show-ref --hash $0 | head -n 1)'
next = !git add . && git rebase --continue
cleanup = !git remote prune origin && git gc && git clean -dfx && git stash clear
staging = push staging master
staging-db = !git push staging master && heroku run rake db:migrate --remote staging
get-pr = !sh -c 'hub remote add $0 && git fetch $0 && git checkout -b $0-$1 $0/$1 && git rebase master'
fixup = !git commit --amend -C HEAD && git status -sb
rebmerge = !sh -c 'git rebase HEAD $0 && git checkout - && git merge $0'
getpr = !sh -c 'git fetch origin pull/$0/head:pr-$0 && git co pr-$0'
gistdiff = !sh -c 'git log --pretty=email --no-color -p $1..$2 | gist -p -f $0 | pbcopy'
br = !sh -c 'git branch | cut -c 3- | selecta | xargs git checkout'
compare = log --left-right --graph --cherry-pick --oneline
message = show --pretty=full
[merge "gemfilelock"]
name = relocks the gemfile.lock
driver = bundle lock
[format]
pretty = %Cred%h%Creset -%C(yellow)%d%Creset %s %Cblue%an%Creset %Cgreen(%cr)%Creset
[url "git@github.com:"]
insteadOf = "gh:"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
[url "git://github.com/"]
insteadOf = "github:"
[url "git@heroku.com:"]
insteadOf = "heroku:"
[push]
default = simple
[core]
excludesfile = /Users/jyurek/.gitignore
[diff]
noprefix = true
Jump to Line
Something went wrong with that request. Please try again.