diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-27 21:33:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-27 21:33:42 (GMT) |
| commit | 6e96e88ae43e8c78ec0066b0ee87d53987b14098 (patch) | |
| tree | 8a5fd127cbdaaf98f4a5aa607e45eb72f21bc19d /mergetools | |
| parent | 7ae96e3fcfcd4f3d7c18965eb8805554a9e432bc (diff) | |
| parent | eb90ea79c59197e25a40fc3414a75d977f8a8f56 (diff) | |
| download | git-6e96e88ae43e8c78ec0066b0ee87d53987b14098.zip git-6e96e88ae43e8c78ec0066b0ee87d53987b14098.tar.gz git-6e96e88ae43e8c78ec0066b0ee87d53987b14098.tar.bz2 | |
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
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions