@matheusbsbs / matheus-bagliano / commits / 1d77043b00
Fork 0

config documentation: group color items together.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Dec 13, 2006 at 12:11 UTC 1d77043b005921cf7fcebfe680777df23ad10119
1 file changed +18 -18
Documentation/config.txt
+18 -18
@@ -137,10 +137,6 @@ branch.<name>.merge::
137 this option, `git pull` defaults to merge the first refspec fetched.
138 Specify multiple values to get an octopus merge.
139
140 -color.pager::
141 - A boolean to enable/disable colored output when the pager is in
142 - use (default is true).
143 -
140 color.diff::
141 When true (or `always`), always use colors in patch.
142 When false (or `never`), never. When set to `auto`, use
@@ -157,6 +153,24 @@ color.diff.<slot>::
153 `red`, `green`, `yellow`, `blue`, `magenta`, `cyan`, or
154 `white`.
155
156 +color.pager::
157 + A boolean to enable/disable colored output when the pager is in
158 + use (default is true).
159 +
160 +color.status::
161 + A boolean to enable/disable color in the output of
162 + gitlink:git-status[1]. May be set to `true` (or `always`),
163 + `false` (or `never`) or `auto`, in which case colors are used
164 + only when the output is to a terminal. Defaults to false.
165 +
166 +color.status.<slot>::
167 + Use customized color for status colorization. `<slot>` is
168 + one of `header` (the header text of the status message),
169 + `updated` (files which are updated but not committed),
170 + `changed` (files which are changed but not updated in the index),
171 + or `untracked` (files which are not tracked by git). The values of
172 + these variables may be specified as in color.diff.<slot>.
173 +
174 diff.renameLimit::
175 The number of files to consider when performing the copy/rename
176 detection; equivalent to the git diff option '-l'.
@@ -271,20 +285,6 @@ showbranch.default::
285 The default set of branches for gitlink:git-show-branch[1].
286 See gitlink:git-show-branch[1].
287
274 -color.status::
275 - A boolean to enable/disable color in the output of
276 - gitlink:git-status[1]. May be set to `true` (or `always`),
277 - `false` (or `never`) or `auto`, in which case colors are used
278 - only when the output is to a terminal. Defaults to false.
279 -
280 -color.status.<slot>::
281 - Use customized color for status colorization. `<slot>` is
282 - one of `header` (the header text of the status message),
283 - `updated` (files which are updated but not committed),
284 - `changed` (files which are changed but not updated in the index),
285 - or `untracked` (files which are not tracked by git). The values of
286 - these variables may be specified as in color.diff.<slot>.
287 -
288 tar.umask::
289 By default, gitlink:git-tar-tree[1] sets file and directories modes
290 to 0666 or 0777. While this is both useful and acceptable for projects