diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-02-16 18:24:41 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-20 12:31:56 -0800 |
| commit | 5a59a2301f6ec9bcf1b101edb9ca33beb465842f (patch) | |
| tree | e343ac79b7b9039a26f7ff9545e5bee53f06f8b2 /merge-recursive.c | |
| parent | 35ee755a8c43bcb3c2786522d423f006c23d32df (diff) | |
| download | git-5a59a2301f6ec9bcf1b101edb9ca33beb465842f.tar.gz | |
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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 4851825aeb..28b36c08f2 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3764,6 +3764,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; |