GIT Basics

git checkout -b some-experiment
# do some work
git commit -m 'some feature'
# do some more work
git commit -m 'some other feature'
# experiment fails
git checkout master
# start working on new thing
git commit -m 'some mundane bugifx'
# realize I need some code from my experimental branch, but not the whole thing
gitk --all
# figure out the sha-1 of the change I want
git cherry-pick the_sha1_of_some_other_feature