Documentation: color.* = true means "auto"

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 39d1ef5298bd81868079b8d82ba56157e4785b5d..0e45ec547cdfba88ed660dea96b50be2d925e225 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -346,14 +346,21 @@ branch.<name>.mergeoptions::
        option values containing whitespace characters are currently not
        supported.
 
        option values containing whitespace characters are currently not
        supported.
 

+branch.<name>.rebase::
+       When true, rebase the branch <name> on top of the fetched branch,
+       instead of merging the default branch from the default remote.
+       *NOTE*: this is a possibly dangerous operation; do *not* use
+       it unless you understand the implications (see gitlink:git-rebase[1]
+       for details).
+

 clean.requireForce::
        A boolean to make git-clean do nothing unless given -f
        or -n.   Defaults to true.
 
 color.branch::
        A boolean to enable/disable color in the output of
 clean.requireForce::
        A boolean to make git-clean do nothing unless given -f
        or -n.   Defaults to true.
 
 color.branch::
        A boolean to enable/disable color in the output of

-       gitlink:git-branch[1]. May be set to `true` (or `always`),
-       `false` (or `never`) or `auto`, in which case colors are used
+       gitlink:git-branch[1]. May be set to `always`,
+       `false` (or `never`) or `auto` (or `true`), in which case colors are used

        only when the output is to a terminal. Defaults to false.
 
 color.branch.<slot>::
        only when the output is to a terminal. Defaults to false.
 
 color.branch.<slot>::


@@ -371,9 +378,9 @@ second is the background.  The position of the attribute, if any,
 doesn't matter.
 
 color.diff::
 doesn't matter.
 
 color.diff::

-       When true (or `always`), always use colors in patch.
-       When false (or `never`), never.  When set to `auto`, use
-       colors only when the output is to the terminal.
+       When set to `always`, always use colors in patch.
+       When false (or `never`), never.  When set to `true` or `auto`, use
+       colors only when the output is to the terminal. Defaults to false.

 
 color.diff.<slot>::
        Use customized color for diff colorization.  `<slot>` specifies
 
 color.diff.<slot>::
        Use customized color for diff colorization.  `<slot>` specifies


@@ -390,8 +397,8 @@ color.pager::
 
 color.status::
        A boolean to enable/disable color in the output of
 
 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
+       gitlink:git-status[1]. May be set to `always`,
+       `false` (or `never`) or `auto` (or `true`), in which case colors are used

        only when the output is to a terminal. Defaults to false.
 
 color.status.<slot>::
        only when the output is to a terminal. Defaults to false.
 
 color.status.<slot>::


@@ -500,7 +507,9 @@ gc.rerereunresolved::
 rerere.enabled::
        Activate recording of resolved conflicts, so that identical
        conflict hunks can be resolved automatically, should they
 rerere.enabled::
        Activate recording of resolved conflicts, so that identical
        conflict hunks can be resolved automatically, should they

-       be encountered again.  See gitlink:git-rerere[1].
+       be encountered again.  gitlink:git-rerere[1] command is by
+       default enabled, but can be disabled by setting this option to
+       false.

 
 gitcvs.enabled::
        Whether the CVS server interface is enabled for this repository.
 
 gitcvs.enabled::
        Whether the CVS server interface is enabled for this repository.


@@ -543,6 +552,11 @@ specified as 'gitcvs.<access_method>.<varname>' (where 'access_method'
 is one of "ext" and "pserver") to make them apply only for the given
 access method.
 
 is one of "ext" and "pserver") to make them apply only for the given
 access method.
 

+http.proxy::
+       Override the HTTP proxy, normally configured using the 'http_proxy'
+       environment variable (see gitlink:curl[1]).  This can be overridden
+       on a per-remote basis; see remote.<name>.proxy
+

 http.sslVerify::
        Whether to verify the SSL certificate when fetching or pushing
        over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment
 http.sslVerify::
        Whether to verify the SSL certificate when fetching or pushing
        over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment


@@ -691,6 +705,11 @@ remote.<name>.url::
        The URL of a remote repository.  See gitlink:git-fetch[1] or
        gitlink:git-push[1].
 
        The URL of a remote repository.  See gitlink:git-fetch[1] or
        gitlink:git-push[1].
 

+remote.<name>.proxy::
+       For remotes that require curl (http, https and ftp), the URL to
+       the proxy to use for that remote.  Set to the empty string to
+       disable proxying for that remote.
+

 remote.<name>.fetch::
        The default set of "refspec" for gitlink:git-fetch[1]. See
        gitlink:git-fetch[1].
 remote.<name>.fetch::
        The default set of "refspec" for gitlink:git-fetch[1]. See
        gitlink:git-fetch[1].