summaryrefslogtreecommitdiff
path: root/builtin/pull.c
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2019-02-16 18:24:41 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-02-20 12:31:56 -0800
commit5a59a2301f6ec9bcf1b101edb9ca33beb465842f (patch)
treee343ac79b7b9039a26f7ff9545e5bee53f06f8b2 /builtin/pull.c
parentGit 2.21-rc2 (diff)
downloadtgif-5a59a2301f6ec9bcf1b101edb9ca33beb465842f.tar.xz
completion: add more parameter value completion
This adds value completion for a couple more paramters. To make it easier to maintain these hard coded lists, add a comment at the original list/code to remind people to update git-completion.bash too. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pull.c')
-rw-r--r--builtin/pull.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 701d1473dc..33db889955 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -56,6 +56,10 @@ static enum rebase_type parse_config_rebase(const char *key, const char *value,
return REBASE_MERGES;
else if (!strcmp(value, "interactive") || !strcmp(value, "i"))
return REBASE_INTERACTIVE;
+ /*
+ * Please update _git_config() in git-completion.bash when you
+ * add new rebase modes.
+ */
if (fatal)
die(_("Invalid value for %s: %s"), key, value);