Re: [PATCH v3 7/7] cherry-pick: add `--empty` for more robust redundant commit handling

[Junio C Hamano <gitster@pobox.com>]

phillip.wood123@gmail.com writes:

>> +Note that this option specifies how to handle a commit that was not initially
>> +empty, but rather became empty due to a previous commit. Commits that were
>> +initially empty will cause the cherry-pick to fail. To force the inclusion of
>> +those commits, use `--allow-empty`.
>
> I found this last paragraph is slightly confusing now --empty=keep
> implies --allow-empty. Maybe we could change the middle sentence to
> say something like
>
>     With the exception of `--empty=keep` commits that were initially
>     empty will cause the cherry-pick to fail.

That is certainly easier to read and much less confusing.

Thanks, both.