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 HEAD
to unstage everything- Stage pieces with
git add --patch
- Remove everything unstaged or untracked (so new file) with
git stash -k -u
rake spec
to ensure that staged pieces pass specs on their owngit commit
git stash pop
to restore the stash from (2)