diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-08-19 10:52:10 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-21 18:28:11 (GMT) |
commit | eb90ea79c59197e25a40fc3414a75d977f8a8f56 (patch) | |
tree | 3bb04c731533822ee88a435f4efaef5e5fabbca2 /Documentation/diff-config.txt | |
parent | 7e8bfb0412581daf8f3c89909f1d37844e8610dd (diff) | |
download | git-eb90ea79c59197e25a40fc3414a75d977f8a8f56.zip git-eb90ea79c59197e25a40fc3414a75d977f8a8f56.tar.gz git-eb90ea79c59197e25a40fc3414a75d977f8a8f56.tar.bz2 |
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/diff-config.txt')
-rw-r--r-- | Documentation/diff-config.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 77caa66..85bca83 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -208,3 +208,15 @@ diff.wsErrorHighlight:: whitespace errors are colored with `color.diff.whitespace`. The command line option `--ws-error-highlight=<kind>` overrides this setting. + +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]. |