Re: [PATCH 4/4] cherry-pick: Add `--empty` for more robust redundant commit handling

From: Kristoffer Haugsbakk <code@khaugsbakk.name>
Date: Jan 20, 2024, 20:24 UTC
Message-ID: <06eb93d7-7113-4583-9860-28a6a6d528a2@app.fastmail.com>
In-Reply-To: <20240119060721.3734775-5-brianmlyles@gmail.com>

Hi

On Fri, Jan 19, 2024, at 06:59, brianmlyles@gmail.com wrote:

Show 12 quoted lines

> From: Brian Lyles <brianmlyles@gmail.com>
> ---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
> +--empty=(stop|drop|keep)::
> +	How to handle commits being cherry-picked that are redundant with
> +	changes already in the current history.
> ++
> +--

Trailing whitespace on this line.

-- 
Kristoffer Haugsbakk