summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-01-15 15:20:29 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-15 15:20:29 -0800
commit2ce8de6bf9ddacabe77407e129fd721459e57881 (patch)
tree5c5f722f0194d01f6b89473e87d981a0a182e7ab /builtin/am.c
parentMerge branch 'nk/perf-fsmonitor-cleanup' (diff)
parentbuiltin/*: update usage format (diff)
downloadtgif-2ce8de6bf9ddacabe77407e129fd721459e57881.tar.xz
Merge branch 'zh/arg-help-format'
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.c4
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)",