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/am.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/am.c')
| -rw-r--r-- | builtin/am.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c index ef5b9459af..9f084d58bc 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2395,7 +2395,7 @@ int cmd_am(int argc, const char **argv, const char *prefix) { OPTION_STRING, 'S', "gpg-sign", &state.sign_commit, N_("key-id"), N_("GPG-sign commits"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" }, - OPT_CALLBACK_F(STOP_ON_EMPTY_COMMIT, "empty", &state.empty_type, "{stop,drop,keep}", + OPT_CALLBACK_F(0, "empty", &state.empty_type, "(stop|drop|keep)", N_("how to handle empty patches"), PARSE_OPT_NONEG, am_option_parse_empty), OPT_HIDDEN_BOOL(0, "rebasing", &state.rebasing, |