diff options
| -rw-r--r-- | Documentation/config.txt | 12 | ||||
| -rw-r--r-- | Documentation/diff-config.txt | 12 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | generate-cmdlist.sh | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 9f2deae463..322d93262f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1219,18 +1219,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 diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 77caa66c2f..85bca83c30 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]. @@ -2047,7 +2047,7 @@ $(BUILT_INS): git$X command-list.h: generate-cmdlist.sh command-list.txt -command-list.h: $(wildcard Documentation/git*.txt) Documentation/config.txt +command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt $(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh command-list.txt >$@+ && mv $@+ $@ SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\ diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh index c4124acbe7..fa1e5475e8 100755 --- a/generate-cmdlist.sh +++ b/generate-cmdlist.sh @@ -80,7 +80,7 @@ print_config_list () { cat <<EOF static const char *config_name_list[] = { EOF - grep '^[a-zA-Z].*\..*::$' Documentation/config.txt | + grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt | sed '/deprecated/d; s/::$//; s/, */\n/g' | sort | while read line |