Skip to content

Commit

Permalink
config documentation: group color items together.
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Dec 13, 2006
1 parent 3598500 commit 1d77043
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,6 @@ branch.<name>.merge::
this option, `git pull` defaults to merge the first refspec fetched.
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::
When true (or `always`), always use colors in patch.
When false (or `never`), never. When set to `auto`, use
Expand All @@ -157,6 +153,24 @@ color.diff.<slot>::
`red`, `green`, `yellow`, `blue`, `magenta`, `cyan`, or
`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::
The number of files to consider when performing the copy/rename
detection; equivalent to the git diff option '-l'.
Expand Down Expand Up @@ -271,20 +285,6 @@ showbranch.default::
The default set of branches for 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::
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
Expand Down

0 comments on commit 1d77043

Please sign in to comment.