Skip to content

Commit 6e96e88

Browse files
gitstergitster
committed
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
2 parents 7ae96e3 + eb90ea7 commit 6e96e88

4 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎Documentation/config.txt‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,18 +1219,6 @@ This does not affect linkgit:git-format-patch[1] or the
12191219
'git-diff-{asterisk}' plumbing commands. Can be overridden on the
12201220
command line with the `--color[=<when>]` option.
12211221

1222-
diff.colorMoved::
1223-
If set to either a valid `<mode>` or a true value, moved lines
1224-
in a diff are colored differently, for details of valid modes
1225-
see '--color-moved' in linkgit:git-diff[1]. If simply set to
1226-
true the default color mode will be used. When set to false,
1227-
moved lines are not colored.
1228-
1229-
diff.colorMovedWS::
1230-
When moved lines are colored using e.g. the `diff.colorMoved` setting,
1231-
this option controls the `<mode>` how spaces are treated
1232-
for details of valid modes see '--color-moved-ws' in linkgit:git-diff[1].
1233-
12341222
color.diff.<slot>::
12351223
Use customized color for diff colorization. `<slot>` specifies
12361224
which part of the patch to use the specified color, and is one

‎Documentation/diff-config.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,3 +208,15 @@ diff.wsErrorHighlight::
208208
whitespace errors are colored with `color.diff.whitespace`.
209209
The command line option `--ws-error-highlight=<kind>`
210210
overrides this setting.
211+
212+
diff.colorMoved::
213+
If set to either a valid `<mode>` or a true value, moved lines
214+
in a diff are colored differently, for details of valid modes
215+
see '--color-moved' in linkgit:git-diff[1]. If simply set to
216+
true the default color mode will be used. When set to false,
217+
moved lines are not colored.
218+
219+
diff.colorMovedWS::
220+
When moved lines are colored using e.g. the `diff.colorMoved` setting,
221+
this option controls the `<mode>` how spaces are treated
222+
for details of valid modes see '--color-moved-ws' in linkgit:git-diff[1].

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2047,7 +2047,7 @@ $(BUILT_INS): git$X
20472047

20482048
command-list.h: generate-cmdlist.sh command-list.txt
20492049

2050-
command-list.h: $(wildcard Documentation/git*.txt) Documentation/config.txt
2050+
command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt
20512051
$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh command-list.txt >$@+ && mv $@+ $@
20522052

20532053
SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\

‎generate-cmdlist.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ print_config_list () {
8080
cat <<EOF
8181
static const char *config_name_list[] = {
8282
EOF
83-
grep '^[a-zA-Z].*\..*::$' Documentation/config.txt |
83+
grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt |
8484
sed '/deprecated/d; s/::$//; s/, */\n/g' |
8585
sort |
8686
while read line

0 commit comments

Comments
 (0)