diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 09:59:57 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 09:59:58 +0900 |
| commit | b0e7fb2e5cc70a03d75e41fe6b1bde6fdc0872c8 (patch) | |
| tree | d07202c20257da961faf1f9a2d4852371c0289ca /xdiff-interface.c | |
| parent | Merge branch 'ab/receive-pack-use-after-free-fix' (diff) | |
| parent | completion: add more parameter value completion (diff) | |
| download | git-b0e7fb2e5cc70a03d75e41fe6b1bde6fdc0872c8.tar.gz git-b0e7fb2e5cc70a03d75e41fe6b1bde6fdc0872c8.zip | |
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 '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); |