The first patch simply corrects the help text. The second one instead fixes a bug during interruptions where keep and keepbranches flags were not stored/restored. I'm attaching a test to cover this issue as well.