summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3598500)
raw | patch | inline | side by side (parent: 3598500)
author | Junio C Hamano <junkio@cox.net> | |
Wed, 13 Dec 2006 20:11:03 +0000 (12:11 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 13 Dec 2006 20:11:03 +0000 (12:11 -0800) |
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/config.txt | patch | blob | history |
index f5a552ee8722dc0e18265164fd6a6b344d691d57..a3587f83970cf3c7b84b31aa6e90e0dbfb476d65 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
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
`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'.
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