Johannes Schindelin <johannes.schindelin@xxxxxx> writes: > @@ -996,6 +998,8 @@ static int do_pick_commit(enum todo_command command, struct commit *commit, > if (res || command != TODO_REWORD) > goto leave; > flags |= EDIT_MSG | AMEND_MSG; > + if (command == TODO_REWORD) > + flags |= VERIFY_MSG; Good. This looks even cleaner than what we discussed during the review of the previous round. After deciding not to return early, we set the default set of features in flags and then further add verify-msg in when needed. Much easier to understand.