diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-20 06:16:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-20 06:16:08 (GMT) |
| commit | f6c75e392e2d8426b622408ae74f0e2b545609a7 (patch) | |
| tree | 324ea002260857c673adbaa7384c057b5f93c855 /Documentation | |
| parent | 6b5688b760a11430586122173d96b15fd3204308 (diff) | |
| parent | cd8e7593b9c881996a04858a3329e8ed9f1d4dbc (diff) | |
| download | git-f6c75e392e2d8426b622408ae74f0e2b545609a7.zip git-f6c75e392e2d8426b622408ae74f0e2b545609a7.tar.gz git-f6c75e392e2d8426b622408ae74f0e2b545609a7.tar.bz2 | |
Merge branch 'jk/config-type-color-ends-with-lf'
"git config --type=color ..." is meant to replace "git config --get-color"
but there is a slight difference that wasn't documented, which is
now fixed.
* jk/config-type-color-ends-with-lf:
config: document --type=color output is a complete line
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-config.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 1bfe9f5..d0b9c50 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -240,7 +240,9 @@ Valid `<type>`'s include: output. The optional `default` parameter is used instead, if there is no color configured for `name`. + -`--type=color [--default=<default>]` is preferred over `--get-color`. +`--type=color [--default=<default>]` is preferred over `--get-color` +(but note that `--get-color` will omit the trailing newline printed by +`--type=color`). -e:: --edit:: |