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 /diff.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 'diff.c')
| -rw-r--r-- | diff.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -179,6 +179,10 @@ static int parse_submodule_params(struct diff_options *options, const char *valu options->submodule_format = DIFF_SUBMODULE_SHORT; else if (!strcmp(value, "diff")) options->submodule_format = DIFF_SUBMODULE_INLINE_DIFF; + /* + * Please update $__git_diff_submodule_formats in + * git-completion.bash when you add new formats. + */ else return -1; return 0; @@ -205,6 +209,10 @@ long parse_algorithm_value(const char *value) return XDF_PATIENCE_DIFF; else if (!strcasecmp(value, "histogram")) return XDF_HISTOGRAM_DIFF; + /* + * Please update $__git_diff_algorithms in git-completion.bash + * when you add new algorithms. + */ return -1; } |