Ramkumar Ramachandra wrote: > 3. Instead of just saying "fatal: Malformed instruction sheet" like we > do now, we can put in something a little more helpful like "error: > Cannot cherry-pick during a revert" before this message. So: > > $ git cherry-pick moo > ... conflict ... > # resolve conflict > $ git revert --continue > error: Cannot cherry-pick during a revert > fatal: Malformed instruction sheet > > This makes it clear to the user that the instruction sheet is to > blame, and in what way. Makes sense. Would it be possible to rephrase the message "Malformed instruction sheet" to encompass this error? After all, the instruction sheet is grammatically well formed and the only mistake it made was to do something unexpected. Maybe error: cannot resume a cherry-pick with "git revert --continue" fatal: unusable instruction sheet or something along those lines. I dunno. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html