aboutsummaryrefslogtreecommitdiffstats
path: root/merge-recursive.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 /merge-recursive.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 'merge-recursive.c')
-rw-r--r--merge-recursive.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index f270fa66f3..6c40c61c47 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3759,6 +3759,10 @@ int parse_merge_opt(struct merge_options *o, const char *s)
return -1;
o->merge_detect_rename = 1;
}
+ /*
+ * Please update $__git_merge_strategy_options in
+ * git-completion.bash when you add new options
+ */
else
return -1;
return 0;