EDIT

The given commit is to be cherry-picked, but the client should stop to allow the user to edit the changes before committing them.