Skip to content

Instantly share code, notes, and snippets.

View smerrell's full-sized avatar

Sam Merrell smerrell

View GitHub Profile
@smerrell
smerrell / keybase.md
Created October 22, 2015 03:18
keybase.md

Keybase proof

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:

@smerrell
smerrell / about.md
Created August 15, 2011 20:37 — forked from jasonrudolph/about.md
Programming Achievements: How to Level Up as a Developer
@smerrell
smerrell / gist:905949
Created April 6, 2011 16:13
My ~/.gitconfig aliases
[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