Merge branch 'maint' of git://repo.or.cz/git-gui into maint

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d44bc7ac4c6b872ac20bf97c3b5e221552906f14..6d8cca46ab934826a84647cbd6e441fee286f330 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -333,7 +333,7 @@ branch.autosetupmerge::
        so that linkgit:git-pull[1] will appropriately merge from that
        remote branch.  Note that even if this option is not set,
        this behavior can be chosen per-branch using the `--track`
-       and `--no-track` options.  This option defaults to false.
+       and `--no-track` options.  This option defaults to true.
 
 branch.<name>.remote::
        When in branch <name>, it tells `git fetch` which remote to fetch.
@@ -367,6 +367,11 @@ branch.<name>.rebase::
        it unless you understand the implications (see linkgit:git-rebase[1]
        for details).
 
+browser.<tool>.path::
+       Override the path for the given tool that may be used to
+       browse HTML help (see '-w' option in linkgit:git-help[1]) or a
+       working repository in gitweb (see linkgit:git-instaweb[1]).
+
 clean.requireForce::
        A boolean to make git-clean do nothing unless given -f
        or -n.   Defaults to true.
@@ -406,7 +411,8 @@ color.diff.<slot>::
        in color.branch.<slot>.
 
 color.interactive::
-       When set to `always`, always use colors in `git add --interactive`.
+       When set to `always`, always use colors for interactive prompts
+       and displays (such as those used by "git add --interactive").
        When false (or `never`), never.  When set to `true` or `auto`, use
        colors only when the output is to the terminal. Defaults to false.
 
@@ -472,7 +478,8 @@ fetch.unpackLimit::
        exceeds this limit then the received pack will be stored as
        a pack, after adding any missing delta bases.  Storing the
        pack from a push can make the push operation complete faster,
-       especially on slow filesystems.
+       especially on slow filesystems.  If not set, the value of
+       `transfer.unpackLimit` is used instead.
 
 format.numbered::
        A boolean which can enable sequence numbers in patch subjects.
@@ -498,14 +505,14 @@ gc.auto::
        When there are approximately more than this many loose
        objects in the repository, `git gc --auto` will pack them.
        Some Porcelain commands use this command to perform a
-       light-weight garbage collection from time to time.  Setting
-       this to 0 disables it.
+       light-weight garbage collection from time to time.  The
+       default value is 6700.  Setting this to 0 disables it.
 
 gc.autopacklimit::
        When there are more than this many packs that are not
        marked with `*.keep` file in the repository, `git gc
-       --auto` consolidates them into one larger pack.  Setting
-       this to 0 disables this.
+       --auto` consolidates them into one larger pack.  The
+       default value is 20.  Setting this to 0 disables it.
 
 gc.packrefs::
        `git gc` does not run `git pack-refs` in a bare repository by
@@ -541,8 +548,8 @@ rerere.enabled::
        Activate recording of resolved conflicts, so that identical
        conflict hunks can be resolved automatically, should they
        be encountered again.  linkgit:git-rerere[1] command is by
-       default enabled, but can be disabled by setting this option to
-       false.
+       default enabled if you create `rr-cache` directory under
+       `$GIT_DIR`, but can be disabled by setting this option to false.
 
 gitcvs.enabled::
        Whether the CVS server interface is enabled for this repository.
@@ -585,6 +592,15 @@ 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.
 
+help.browser::
+       Specify the browser that will be used to display help in the
+       'web' format. See linkgit:git-help[1].
+
+help.format::
+       Override the default help format used by linkgit:git-help[1].
+       Values 'man', 'info', 'web' and 'html' are supported. 'man' is
+       the default. 'web' and 'html' are the same.
+
 http.proxy::
        Override the HTTP proxy, normally configured using the 'http_proxy'
        environment variable (see linkgit:curl[1]).  This can be overridden
@@ -642,6 +658,25 @@ i18n.logOutputEncoding::
        Character encoding the commit messages are converted to when
        running `git-log` and friends.
 
+instaweb.browser::
+       Specify the program that will be used to browse your working
+       repository in gitweb. See linkgit:git-instaweb[1].
+
+instaweb.httpd::
+       The HTTP daemon command-line to start gitweb on your working
+       repository. See linkgit:git-instaweb[1].
+
+instaweb.local::
+       If true the web server started by linkgit:git-instaweb[1] will
+       be bound to the local IP (127.0.0.1).
+
+instaweb.modulepath::
+       The module path for an apache httpd used by linkgit:git-instaweb[1].
+
+instaweb.port::
+       The port number to bind the gitweb httpd to. See
+       linkgit:git-instaweb[1].
+
 log.showroot::
        If true, the initial commit will be shown as a big creation event.
        This is equivalent to a diff against an empty tree.
@@ -832,7 +867,8 @@ receive.unpackLimit::
        exceeds this limit then the received pack will be stored as
        a pack, after adding any missing delta bases.  Storing the
        pack from a push can make the push operation complete faster,
-       especially on slow filesystems.
+       especially on slow filesystems.  If not set, the value of
+       `transfer.unpackLimit` is used instead.
 
 receive.denyNonFastForwards::
        If set to true, git-receive-pack will deny a ref update which is
@@ -843,3 +879,9 @@ receive.denyNonFastForwards::
 transfer.unpackLimit::
        When `fetch.unpackLimit` or `receive.unpackLimit` are
        not set, the value of this variable is used instead.
+       The default value is 100.
+
+web.browser::
+       Specify a web browser that may be used by some commands.
+       Currently only linkgit:git-instaweb[1] and linkgit:git-help[1]
+       may use it.