Merge branch 'fixups'

A couple of fixes that should be squashed during the next merging rebase of Git for Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
microsoft · Sep 10, 2018 · 0bccc7f · 0bccc7f
2 parents 5aea1f3 + 774a0ca
commit 0bccc7f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 "