Re*: [PATCH 1/2] rebase -i --autosquash: demonstrate a problem skipping the last squash

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

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> +	test_must_fail git -c core.editor="grep -q ^pick" \
> +		rebase -ki --autosquash HEAD~4 &&

When merged to 'pu', this reveals that "git rebase" rewritten in C
knows "--keep-empty" but not "-k".

I did a quick eyeballing between master:git-rebase.sh and
pu:builtin/rebase.c and I think that it is the only one that is
missed, but somebody may want to lend us a second set of eyes.

-- >8 --
Subject: rebase: re-add forgotten -k that stands for --keep-empty

630a70ea ("builtin rebase: support `keep-empty` option", 2018-08-08)
forgot that the option comes with a short-and-sweet -k synonym.  Add
it back.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 87590047b3..b26f9c10cf 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -847,7 +847,7 @@ 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,
+		OPT_BOOL('k', "keep-empty", &options.keep_empty,
 			 N_("preserve empty commits during rebase")),
 		OPT_BOOL(0, "autosquash", &options.autosquash,
 			 N_("move commits that begin with "