If you ever have more than one commit's worth of changes in your git work tree, and you're trying to separate the commits:
git reset HEADto unstage everything- Stage pieces with
git add --patch - Remove everything unstaged or untracked (so new file) with
git stash -k -u rake specto ensure that staged pieces pass specs on their owngit commitgit stash popto restore the stash from (2)