diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-02-16 14:24:41 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-20 23:31:56 +0300 |
| commit | 5a59a2301f6ec9bcf1b101edb9ca33beb465842f (patch) | |
| tree | e343ac79b7b9039a26f7ff9545e5bee53f06f8b2 /xdiff-interface.c | |
| parent | 35ee755a8c43bcb3c2786522d423f006c23d32df (diff) | |
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 'xdiff-interface.c')
| -rw-r--r-- | xdiff-interface.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index 80f060d278..8509f9ea22 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -306,6 +306,10 @@ int git_xmerge_config(const char *var, const char *value, void *cb) git_xmerge_style = XDL_MERGE_DIFF3; else if (!strcmp(value, "merge")) git_xmerge_style = 0; + /* + * Please update _git_checkout() in + * git-completion.bash when you add new merge config + */ else die("unknown style '%s' given for '%s'", value, var); |