aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-03-07 09:59:57 +0900
committerJunio C Hamano <gitster@pobox.com>2019-03-07 09:59:58 +0900
commitb0e7fb2e5cc70a03d75e41fe6b1bde6fdc0872c8 (patch)
treed07202c20257da961faf1f9a2d4852371c0289ca /builtin/log.c
parent4751a1673c7d4aeb1b6462f89fa7d86c05898d05 (diff)
parent5a59a2301f6ec9bcf1b101edb9ca33beb465842f (diff)
downloadgit-b0e7fb2e5cc70a03d75e41fe6b1bde6fdc0872c8.tar.gz
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/log.c')
-rw-r--r--builtin/log.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 57869267d8..ab859f5904 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -84,6 +84,10 @@ static int parse_decoration_style(const char *value)
return DECORATE_SHORT_REFS;
else if (!strcmp(value, "auto"))
return auto_decoration_style();
+ /*
+ * Please update _git_log() in git-completion.bash when you
+ * add new decoration styles.
+ */
return -1;
}
@@ -1228,6 +1232,10 @@ static int thread_callback(const struct option *opt, const char *arg, int unset)
*thread = THREAD_SHALLOW;
else if (!strcmp(arg, "deep"))
*thread = THREAD_DEEP;
+ /*
+ * Please update _git_formatpatch() in git-completion.bash
+ * when you add new options.
+ */
else
return 1;
return 0;