| commit | f7c1b23819ec8b838e5427ed2e7cd12c81a796d2 | |
| author | René Scharfe <l.s.r@web.de> | |
| Sat, 28 Oct 2023 11:58:07 +0000 (28 13:58 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 29 Oct 2023 03:10:45 +0000 (29 12:10 +0900) | ||
| tree | be73263c45b0823e03217f08bd03255a671494f9 | treesnapshot (tar.gz zip) |
| parent | 43c8a30d150ecede9709c1f2527c8fba92c65f40 | commitdiff |
am, rebase: fix arghelp syntax of --empty
Use parentheses and pipes to present alternatives in the argument help
for the --empty options of git am and git rebase, like in the rest of
the documentation.
While at it remove a stray use of the enum empty_action value
STOP_ON_EMPTY_COMMIT to indicate that no short option is present.
While it has a value of 0 and thus there is no user-visible change,
that enum is not meant to hold short option characters. Hard-code 0,
like we do for other options without a short option.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Use parentheses and pipes to present alternatives in the argument help
for the --empty options of git am and git rebase, like in the rest of
the documentation.
While at it remove a stray use of the enum empty_action value
STOP_ON_EMPTY_COMMIT to indicate that no short option is present.
While it has a value of 0 and thus there is no user-visible change,
that enum is not meant to hold short option characters. Hard-code 0,
like we do for other options without a short option.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-rebase.txt | diffblobblamehistory | |
| builtin/am.c | diffblobblamehistory | |
| builtin/rebase.c | diffblobblamehistory |