diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-08-19 12:52:10 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-21 11:28:11 -0700 |
| commit | eb90ea79c59197e25a40fc3414a75d977f8a8f56 (patch) | |
| tree | 3bb04c731533822ee88a435f4efaef5e5fabbca2 /Documentation/config.txt | |
| parent | 7e8bfb0412581daf8f3c89909f1d37844e8610dd (diff) | |
| download | git-eb90ea79c59197e25a40fc3414a75d977f8a8f56.tar.gz | |
generate-cmdlist.sh: collect config from all config.txt files
This script uses Documentation/config.txt as input for "git help
--config" and "git config" completion but it misses the fact that
config.txt includes other txt files. Include all *config.txt as input
when scanning for config keys. This could produce false positives, but
as long as we stick to the blah-config.txt naming convention, we
should be ok.
While at there, move diff.* from config.txt to diff-config.txt where
all other diff config keys are.
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 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 1c42364988..45c102c963 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1203,18 +1203,6 @@ This does not affect linkgit:git-format-patch[1] or the 'git-diff-{asterisk}' plumbing commands. Can be overridden on the command line with the `--color[=<when>]` option. -diff.colorMoved:: - If set to either a valid `<mode>` or a true value, moved lines - in a diff are colored differently, for details of valid modes - see '--color-moved' in linkgit:git-diff[1]. If simply set to - true the default color mode will be used. When set to false, - moved lines are not colored. - -diff.colorMovedWS:: - When moved lines are colored using e.g. the `diff.colorMoved` setting, - this option controls the `<mode>` how spaces are treated - for details of valid modes see '--color-moved-ws' in linkgit:git-diff[1]. - color.diff.<slot>:: Use customized color for diff colorization. `<slot>` specifies which part of the patch to use the specified color, and is one |