Re: [PATCH v2 8/8] cherry-pick: add `--empty` for more robust redundant commit handling
Hello,
There's a typo.
On Saturday, 10 February 2024 08:43:56 CET Brian Lyles wrote:
> +--
> ++
> +Note that this option species how to handle a commit that was not initially
Show 19 quoted lines
> +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`.
> ++
> +
> --keep-redundant-commits::
> - If a commit being cherry picked duplicates a commit already in the
> - current history, it will become empty. By default these
> - redundant commits cause `cherry-pick` to stop so the user can
> - examine the commit. This option overrides that behavior and
> - creates an empty commit object. Note that use of this option only
> - results in an empty commit when the commit 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`.
> + Deprecated synonym for `--empty=keep`.
>
> --strategy=<strategy>::
> Use the given merge strategy. Should only be used once.
Otherwise, documentation looks good to me.
JN
Jean-Noël AVILA <jn.avila@free.fr>