aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-13 12:11:03 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-13 12:11:03 -0800
commit1d77043b005921cf7fcebfe680777df23ad10119 (patch)
treedf8f4079925c40ea91f0652a70ad6ce566c0c92e /Documentation
parent359850041e8158f6aeb70ad611ef1ba8834b8349 (diff)
downloadgit-1d77043b005921cf7fcebfe680777df23ad10119.tar.gz
git-1d77043b005921cf7fcebfe680777df23ad10119.tar.xz
config documentation: group color items together.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt36
1 files changed, 18 insertions, 18 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index f5a552ee8..a3587f839 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -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
@@ -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'.
@@ -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