Snippet #905
Git Pro-tip: git stash --keep-index can be very handy for teasing apart the independent components of a commit (eg. so that you can stage some of the changes in the work tree, run the tests on them, make a commit, and then proceed with the rest).