I hereby claim:
- I am smerrell on github.
- I am smerrell (https://keybase.io/smerrell) on keybase.
- I have a public key whose fingerprint is C9AB 7DB0 F80E A5C4 313E F671 1416 609F 619F A91C
To claim this, I am signing this object:
I hereby claim:
To claim this, I am signing this object:
This gist is part of a blog post. Check it out at:
http://jasonrudolph.com/blog/2011/08/09/programming-achievements-how-to-level-up-as-a-developer
[alias] | |
# Git-tfs workflows | |
ct = tfs ct --build-default-comment | |
tfsrebase = !git stash && git checkout master && git tfs pull && git checkout @{-1} && git rebase master && git stash pop | |
tfsworkflow = !git checkout master && git tfs pull && git checkout @{-1} && git rebase master && git checkout master && git merge @{-1} --ff-only && git tfs ct --build-default-comment | |
# Github workflows | |
upmaster = !git checkout master && git fetch upstream && git merge upstream/master --ff-only && git push origin HEAD | |
uprebase = !git checkout master && git fetch upstream && git merge upstream/master --ff-only && git push origin HEAD && git checkout @{-1} && git rebase master |