summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-03-07 09:59:57 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-03-07 09:59:58 +0900
commitb0e7fb2e5cc70a03d75e41fe6b1bde6fdc0872c8 (patch)
treed07202c20257da961faf1f9a2d4852371c0289ca /builtin/am.c
parentMerge branch 'ab/receive-pack-use-after-free-fix' (diff)
parentcompletion: add more parameter value completion (diff)
downloadtgif-b0e7fb2e5cc70a03d75e41fe6b1bde6fdc0872c8.tar.xz
Merge branch 'nd/completion-more-parameters'
The command line completion (in contrib/) has been taught to complete more subcommand parameters. * nd/completion-more-parameters: completion: add more parameter value completion
Diffstat (limited to 'builtin/am.c')
-rw-r--r--builtin/am.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 86e33495b0..4fb107a9d1 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -2121,6 +2121,10 @@ static int parse_opt_patchformat(const struct option *opt, const char *arg, int
*opt_value = PATCH_FORMAT_HG;
else if (!strcmp(arg, "mboxrd"))
*opt_value = PATCH_FORMAT_MBOXRD;
+ /*
+ * Please update $__git_patchformat in git-completion.bash
+ * when you add new options
+ */
else
return error(_("Invalid value for --patch-format: %s"), arg);
return 0;