Phillip Wood [off-list ref] writes:
quoted
@@ -521,7 +521,7 @@ static const char *prepare_index(const char **argv, const char *prefix,
else if (is_from_cherry_pick(whence))
die(_("cannot do a partial commit during a cherry-pick."));
else if (is_from_rebase(whence))
- die(_("cannot do a partial commit during a rebase."));
+ die(_("cannot do a partial commit while resolving a commit that became empty."));
"while committing a commit that became empty" would be clearer to me,
but I what you have is definitely an improvement on the existing message.
A stupid question, but wouldn't a partial commit of an empty commit
still an empty commit? IOW, why do we need to reject a partial
commit while committing a commit that became empty?
Thanks.