Re: [PATCH 07/18] builtin rebase: support `keep-empty` option

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Aug 24, 2018, 16:04 UTC
Message-ID: <nycvar.QRO.7.76.6.1808241803100.73@tvgsbejvaqbjf.bet>
In-Reply-To: <20180808152140.14585-8-predatoramigo@gmail.com>

Hi,

On Wed, 8 Aug 2018, Pratik Karki wrote:

Show 11 quoted lines

> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 42ee040da3..fd9ad8efae 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -588,6 +607,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>  			 &options.allow_rerere_autoupdate,
>  			 N_("allow rerere to update index  with resolved "
>  			    "conflict")),
> +		OPT_BOOL(0, "keep-empty", &options.keep_empty,
> +			 N_("preserve empty commits during rebase")),
>  		OPT_END(),

This forgets the short option `-k`, I just noticed. I then looked at the rest of the options, and they seem not to forget the short option anywhere.

I will fix this before sending v2.

Ciao, Dscho