Autogenerated HTML docs for v1.5.3-rc0-101-gd972c

diff --git a/config.txt b/config.txt
index aeece848a542cd72894f4bf3f1bb9f67d18d5c3d..4b67f0adf721d540ddd437254de4aa069f1be0ae 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -309,10 +309,7 @@ branch.autosetupmerge::
        so that gitlink: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 can have values
-       'false' (never touch the configuration), 'all' (do this
-       for all branches), or 'true' (do this only when
-       branching from a remote tracking branch), and defaults to 'true'.
+       and `--no-track` options.  This option defaults to false.
 
 branch.<name>.remote::
        When in branch <name>, it tells `git fetch` which remote to fetch.

diff --git a/git-checkout.html b/git-checkout.html
index ac5f816038996b9f728673f60248f83cb1426430..a400d6f6ce11efeb7eb86bdc06b1461a49eed572 100644 (file)
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -334,9 +334,8 @@ working tree.</p>
         set up configuration so that git-pull will automatically\r
         retrieve data from the remote branch.  Set the\r
         branch.autosetupmerge configuration variable to true if you\r
-        want git-checkout and git-branch to behave as if\r
-        <em>--track</em> were given when you branch from a remote\r
-        tracking branch.\r
+        want git-checkout and git-branch to always behave as if\r
+        <em>--track</em> were given.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -539,7 +538,7 @@ $ git add frotz</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 09-Jul-2007 08:47:47 UTC\r
+Last updated 12-Jul-2007 06:45:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-checkout.txt b/git-checkout.txt
index 82929523c7166f9e5beb08689cef65cfa20c9a8c..818b720b914fa33d3a4b5c7858573bd59f0b0945 100644 (file)
--- a/git-checkout.txt
+++ b/git-checkout.txt
@@ -52,9 +52,8 @@ OPTIONS
        set up configuration so that git-pull will automatically
        retrieve data from the remote branch.  Set the
        branch.autosetupmerge configuration variable to true if you
-       want git-checkout and git-branch to behave as if
-       '--track' were given when you branch from a remote
-       tracking branch.
+       want git-checkout and git-branch to always behave as if
+       '--track' were given.
 
 --no-track::
        When -b is given and a branch is created off a remote branch,

diff --git a/git-config.html b/git-config.html
index 8dbcb06f7b547d26f8a0fbd89acc30cc9605294c..f931bb5cbf2e5a2953e3ffa5b8caed33304fcf31 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1060,10 +1060,7 @@ branch.autosetupmerge
         so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from that\r
         remote branch.  Note that even if this option is not set,\r
         this behavior can be chosen per-branch using the <tt>--track</tt>\r
-        and <tt>--no-track</tt> options.  This option can have values\r
-        <em>false</em> (never touch the configuration), <em>all</em> (do this\r
-        for all branches), or <em>true</em> (do this only when\r
-        branching from a remote tracking branch), and defaults to <em>true</em>.\r
+        and <tt>--no-track</tt> options.  This option defaults to false.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1842,7 +1839,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 09-Jul-2007 08:47:48 UTC\r
+Last updated 12-Jul-2007 06:45:15 UTC\r
 </div>\r
 </div>\r
 </body>\r