Merge branch 'nd/complete-config-vars'

"git help --config" (which is used in command line completion)
missed the configuration variables not described in the main
config.txt file but are described in another file that is included
by it, which has been corrected.

* nd/complete-config-vars:
generate-cmdlist.sh: collect config from all config.txt files

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9f2deae463a8b6cecd5a5588b4f1f15eb4240b6f..322d93262f2ecd003f1364056b84bb5c4922905e 100644 (file)
--- 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 77caa66c2f768b6e43322c4662f45b4191a163c0..85bca83c304c6d95422482b9bc7b8d983bfdc85e 100644 (file)
--- 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].

diff --git a/Makefile b/Makefile
index d03df31c2a61b29caa60928eb3b3f131562152d3..5a969f5830a4105d3e3e6236eaa51e19880cc873 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 c4124acbe7802369ff64c12b48a513437c929a20..fa1e5475e87c746ec0d74f5b1606264d9a3a76dc 100755 (executable)
--- 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