diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-07 10:26:43 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-07 10:26:43 +0900 |
| commit | c0329432acdd1ed344a6b251f35751b0fe38fe1d (patch) | |
| tree | 9ab6b62b55bdb2000aaa84d1837ea8bb1c6ce12f /builtin/rebase.c | |
| parent | Merge branch 'rs/parse-options-cmdmode' (diff) | |
| parent | am, rebase: fix arghelp syntax of --empty (diff) | |
| download | git-c0329432acdd1ed344a6b251f35751b0fe38fe1d.tar.gz git-c0329432acdd1ed344a6b251f35751b0fe38fe1d.zip | |
Merge branch 'rs/fix-arghelp'
Doc and help update.
* rs/fix-arghelp:
am, rebase: fix arghelp syntax of --empty
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 261a9a61fc..043c65dccd 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1145,7 +1145,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) "instead of ignoring them"), 1, PARSE_OPT_HIDDEN), OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate), - OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}", + OPT_CALLBACK_F(0, "empty", &options, "(drop|keep|ask)", N_("how to handle commits that become empty"), PARSE_OPT_NONEG, parse_opt_empty), OPT_CALLBACK_F('k', "keep-empty", &options, NULL, |