config documentation: group color items together.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-12-13 12:11:03 -08:00
parent 359850041e
commit 1d77043b00

View File

@ -137,10 +137,6 @@ branch.<name>.merge::
this option, `git pull` defaults to merge the first refspec fetched. this option, `git pull` defaults to merge the first refspec fetched.
Specify multiple values to get an octopus merge. Specify multiple values to get an octopus merge.
color.pager::
A boolean to enable/disable colored output when the pager is in
use (default is true).
color.diff:: color.diff::
When true (or `always`), always use colors in patch. When true (or `always`), always use colors in patch.
When false (or `never`), never. When set to `auto`, use When false (or `never`), never. When set to `auto`, use
@ -157,6 +153,24 @@ color.diff.<slot>::
`red`, `green`, `yellow`, `blue`, `magenta`, `cyan`, or `red`, `green`, `yellow`, `blue`, `magenta`, `cyan`, or
`white`. `white`.
color.pager::
A boolean to enable/disable colored output when the pager is in
use (default is true).
color.status::
A boolean to enable/disable color in the output of
gitlink:git-status[1]. May be set to `true` (or `always`),
`false` (or `never`) or `auto`, in which case colors are used
only when the output is to a terminal. Defaults to false.
color.status.<slot>::
Use customized color for status colorization. `<slot>` is
one of `header` (the header text of the status message),
`updated` (files which are updated but not committed),
`changed` (files which are changed but not updated in the index),
or `untracked` (files which are not tracked by git). The values of
these variables may be specified as in color.diff.<slot>.
diff.renameLimit:: diff.renameLimit::
The number of files to consider when performing the copy/rename The number of files to consider when performing the copy/rename
detection; equivalent to the git diff option '-l'. detection; equivalent to the git diff option '-l'.
@ -271,20 +285,6 @@ showbranch.default::
The default set of branches for gitlink:git-show-branch[1]. The default set of branches for gitlink:git-show-branch[1].
See gitlink:git-show-branch[1]. See gitlink:git-show-branch[1].
color.status::
A boolean to enable/disable color in the output of
gitlink:git-status[1]. May be set to `true` (or `always`),
`false` (or `never`) or `auto`, in which case colors are used
only when the output is to a terminal. Defaults to false.
color.status.<slot>::
Use customized color for status colorization. `<slot>` is
one of `header` (the header text of the status message),
`updated` (files which are updated but not committed),
`changed` (files which are changed but not updated in the index),
or `untracked` (files which are not tracked by git). The values of
these variables may be specified as in color.diff.<slot>.
tar.umask:: tar.umask::
By default, gitlink:git-tar-tree[1] sets file and directories modes By default, gitlink:git-tar-tree[1] sets file and directories modes
to 0666 or 0777. While this is both useful and acceptable for projects to 0666 or 0777. While this is both useful and acceptable for projects