From c0adcc65e9f4d3f06250bf47fc0c87f0eb803e03 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 24 Aug 2018 16:21:19 +0200 Subject: [PATCH] "fixup! builtin rebase: support `keep-empty` option" This *would* be a fixup commit, except that we want to avoid rewriting commits that we merged from upstream's `pu` branch. Instead, we want to send a new iteration, and then re-merge the new iteration once it made it into the `pu` branch. Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 029d04e9fc..2b1747249d 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1025,7 +1025,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 "