diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-08 14:05:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-08 14:05:54 -0800 |
| commit | 3e52ab222aa3256d9a0ca8d32b49d39d01598996 (patch) | |
| tree | 01b1a08955f4e4e196ea0045df7cd12a5d76df8c /builtin/am.c | |
| parent | 71e83b2e7da61f699f4405233cc20ebf9cb7c66e (diff) | |
| parent | e73fe3dd028ad830bb44b3ad7de15901834e557f (diff) | |
| download | git-3e52ab222aa3256d9a0ca8d32b49d39d01598996.tar.gz | |
Merge branch 'zh/arg-help-format' into maint
Clean up option descriptions in "git cmd --help".
* zh/arg-help-format:
builtin/*: update usage format
parse-options: format argh like error messages
Diffstat (limited to 'builtin/am.c')
| -rw-r--r-- | builtin/am.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/am.c b/builtin/am.c index f22c73a05b..8355e3566f 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2284,10 +2284,10 @@ int cmd_am(int argc, const char **argv, const char *prefix) N_("skip the current patch"), RESUME_SKIP), OPT_CMDMODE(0, "abort", &resume.mode, - N_("restore the original branch and abort the patching operation."), + N_("restore the original branch and abort the patching operation"), RESUME_ABORT), OPT_CMDMODE(0, "quit", &resume.mode, - N_("abort the patching operation but keep HEAD where it is."), + N_("abort the patching operation but keep HEAD where it is"), RESUME_QUIT), { OPTION_CALLBACK, 0, "show-current-patch", &resume.mode, "(diff|raw)", |