@kballard: Question: when I commit that, should I rebase that again (wiping out the old commit), or just leave it on top of the given commit?