diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-12 21:28:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-12 21:28:01 (GMT) |
| commit | b4f0038525623e0e5aa3b35d520de909618cae98 (patch) | |
| tree | 5f4056c2fed1880f4faddb834691ebda724bbf0e /builtin/rebase.c | |
| parent | a56d361f66a78cabaf594b611d817a528ad1d489 (diff) | |
| parent | 120b1eb7314687375e0a229e102ffd194cae0e06 (diff) | |
| download | git-b4f0038525623e0e5aa3b35d520de909618cae98.zip git-b4f0038525623e0e5aa3b35d520de909618cae98.tar.gz git-b4f0038525623e0e5aa3b35d520de909618cae98.tar.bz2 | |
Merge branch 'en/rebase-backend'
Band-aid fixes for two fallouts from switching the default "rebase"
backend.
* en/rebase-backend:
git-rebase.txt: highlight backend differences with commit rewording
sequencer: clear state upon dropping a become-empty commit
i18n: unmark a message in rebase.c
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 cb7aeae..bff53d5 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1543,7 +1543,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) "ignoring them"), REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN), OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate), - OPT_CALLBACK_F(0, "empty", &options, N_("{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), { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL, |