Autogenerated HTML docs for v1.5.0-rc0-ge900

diff --git a/cvs-migration.html b/cvs-migration.html
index d87dff6f9942516005d8ddfae69de17e464ba31e..e882687eea308ab90533a7fc70d5a5008b47ad4f 100644 (file)
--- a/cvs-migration.html
+++ b/cvs-migration.html
@@ -296,14 +296,10 @@ them first before running git pull.</p>
 <div class="title">Note</div>\r
 </td>\r
 <td class="content">\r
-<p>The first <tt>git clone</tt> places the following in the\r
-<tt>my-project/.git/remotes/origin</tt> file, and that's why the previous step\r
-and the next step both work.</p>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>URL: foo.com:/pub/project.git/\r
-Pull: refs/heads/master:refs/remotes/origin/master</tt></pre>\r
-</div></div>\r
+<p>The <tt>pull</tt> command knows where to get updates from because of certain\r
+configuration variables that were set by the first <tt>git clone</tt>\r
+command; see <tt>git repo-config -l</tt> and the <a href="git-repo-config.html">git-repo-config(1)</a> man\r
+page for details.</p>\r
 </td>\r
 </tr></table>\r
 </div>\r
@@ -420,7 +416,7 @@ repositories without the need for a central maintainer.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 09-Dec-2006 21:15:38 UTC\r
+Last updated 01-Jan-2007 03:20:16 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/cvs-migration.txt b/cvs-migration.txt
index b657f4589f95257547b646ef22d3201fefbae6d6..8e09beaa799dbff462b258e5593fd5c79c91312a 100644 (file)
--- a/cvs-migration.txt
+++ b/cvs-migration.txt
@@ -34,13 +34,10 @@ them first before running git pull.
 
 [NOTE]
 ================================
-The first `git clone` places the following in the
-`my-project/.git/remotes/origin` file, and that's why the previous step
-and the next step both work.
-------------
-URL: foo.com:/pub/project.git/
-Pull: refs/heads/master:refs/remotes/origin/master
-------------
+The `pull` command knows where to get updates from because of certain
+configuration variables that were set by the first `git clone`
+command; see `git repo-config -l` and the gitlink:git-repo-config[1] man
+page for details.
 ================================
 
 You can update the shared repository with your changes by first committing

diff --git a/git-clone.html b/git-clone.html
index d0f3524445f440e36be7951fa09fa569cb8c0cdd..f8bb4345bea5f9f6d37d52d96405d97575063277 100644 (file)
--- a/git-clone.html
+++ b/git-clone.html
@@ -372,8 +372,8 @@ configuration variables.</p>
         Also the branch heads at the remote are copied directly\r
         to corresponding local branch heads, without mapping\r
         them to <tt>refs/remotes/origin/</tt>.  When this option is\r
-        used, neither the <tt>origin</tt> branch nor the default\r
-        <tt>remotes/origin</tt> file is created.\r
+        used, neither remote-tracking branches nor the related\r
+        configuration variables are created.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -384,11 +384,8 @@ configuration variables.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Instead of using the branch name <em>origin</em> to keep track\r
-        of the upstream repository, use &lt;name&gt; instead.  Note\r
-        that the shorthand name stored in <tt>remotes/origin</tt> is\r
-        not affected, but the local branch name to pull the\r
-        remote <tt>master</tt> branch into is.\r
+        Instead of using the remote name <em>origin</em> to keep track\r
+        of the upstream repository, use &lt;name&gt; instead.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -510,7 +507,7 @@ Create a repository on the kernel.org machine that borrows from Linus
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 21-Dec-2006 02:25:49 UTC\r
+Last updated 01-Jan-2007 03:20:13 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-clone.txt b/git-clone.txt
index 874934a33243106544181ffeae2fee8b03ff5e8d..96523204ddda292bb01a55f042f249515f821613 100644 (file)
--- a/git-clone.txt
+++ b/git-clone.txt
@@ -75,16 +75,13 @@ OPTIONS
        Also the branch heads at the remote are copied directly
        to corresponding local branch heads, without mapping
        them to `refs/remotes/origin/`.  When this option is
-       used, neither the `origin` branch nor the default
-       `remotes/origin` file is created.
+       used, neither remote-tracking branches nor the related
+       configuration variables are created.
 
 --origin <name>::
 -o <name>::
-       Instead of using the branch name 'origin' to keep track
-       of the upstream repository, use <name> instead.  Note
-       that the shorthand name stored in `remotes/origin` is
-       not affected, but the local branch name to pull the
-       remote `master` branch into is.
+       Instead of using the remote name 'origin' to keep track
+       of the upstream repository, use <name> instead.
 
 --upload-pack <upload-pack>::
 -u <upload-pack>::

diff --git a/git-fetch.html b/git-fetch.html
index 93806b28e3b34d5c72b35893044d55b2fd7116d1..c21c778d5d1188aac7562f146c20358f45766515 100644 (file)
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -558,9 +558,10 @@ file in <tt>$GIT_DIR/remotes</tt> directory can be given; the
 named file should be in the following format:</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>URL: one of the above URL format\r
-Push: &lt;refspec&gt;\r
-Pull: &lt;refspec&gt;</tt></pre>\r
+<pre><tt>        URL: one of the above URL format\r
+        Push: &lt;refspec&gt;\r
+        Pull: &lt;refspec&gt;\r
+</tt></pre>\r
 </div></div>\r
 <p>Then such a short-hand is specified in place of\r
 &lt;repository&gt; without &lt;refspec&gt; parameters on the command\r
@@ -572,10 +573,11 @@ be specified for additional branch mappings.</p>
 of <tt>fetch</tt> instead of <tt>Pull:</tt>):</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>[remote "&lt;remote&gt;"]\r
-        url = &lt;url&gt;\r
-        push = &lt;refspec&gt;\r
-        fetch = &lt;refspec&gt;</tt></pre>\r
+<pre><tt>        [remote "&lt;remote&gt;"]\r
+                url = &lt;url&gt;\r
+                push = &lt;refspec&gt;\r
+                fetch = &lt;refspec&gt;\r
+</tt></pre>\r
 </div></div>\r
 <p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be\r
 specified as an older notation short-hand; the named\r
@@ -587,14 +589,15 @@ without the fragment is equivalent to have this in the
 corresponding file in the <tt>$GIT_DIR/remotes/</tt> directory.</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>URL: &lt;url&gt;\r
-Pull: refs/heads/master:&lt;remote&gt;</tt></pre>\r
+<pre><tt>        URL: &lt;url&gt;\r
+        Pull: refs/heads/master:&lt;remote&gt;\r
+</tt></pre>\r
 </div></div>\r
 <p>while having <tt>&lt;url&gt;#&lt;head&gt;</tt> is equivalent to</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>URL: &lt;url&gt;\r
-Pull: refs/heads/&lt;head&gt;:&lt;remote&gt;</tt></pre>\r
+<pre><tt>        URL: &lt;url&gt;\r
+        Pull: refs/heads/&lt;head&gt;:&lt;remote&gt;</tt></pre>\r
 </div></div>\r
 </div>\r
 <h2>SEE ALSO</h2>\r
@@ -616,7 +619,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 31-Dec-2006 08:29:25 UTC\r
+Last updated 01-Jan-2007 03:20:13 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pull.html b/git-pull.html
index a518025cc2cbb303e680e10f02e3b881a5b8f763..78e856e79468684cd6fbc0d010aa3b6d98d9a69f 100644 (file)
--- a/git-pull.html
+++ b/git-pull.html
@@ -602,9 +602,10 @@ file in <tt>$GIT_DIR/remotes</tt> directory can be given; the
 named file should be in the following format:</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>URL: one of the above URL format\r
-Push: &lt;refspec&gt;\r
-Pull: &lt;refspec&gt;</tt></pre>\r
+<pre><tt>        URL: one of the above URL format\r
+        Push: &lt;refspec&gt;\r
+        Pull: &lt;refspec&gt;\r
+</tt></pre>\r
 </div></div>\r
 <p>Then such a short-hand is specified in place of\r
 &lt;repository&gt; without &lt;refspec&gt; parameters on the command\r
@@ -616,10 +617,11 @@ be specified for additional branch mappings.</p>
 of <tt>fetch</tt> instead of <tt>Pull:</tt>):</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>[remote "&lt;remote&gt;"]\r
-        url = &lt;url&gt;\r
-        push = &lt;refspec&gt;\r
-        fetch = &lt;refspec&gt;</tt></pre>\r
+<pre><tt>        [remote "&lt;remote&gt;"]\r
+                url = &lt;url&gt;\r
+                push = &lt;refspec&gt;\r
+                fetch = &lt;refspec&gt;\r
+</tt></pre>\r
 </div></div>\r
 <p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be\r
 specified as an older notation short-hand; the named\r
@@ -631,14 +633,15 @@ without the fragment is equivalent to have this in the
 corresponding file in the <tt>$GIT_DIR/remotes/</tt> directory.</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>URL: &lt;url&gt;\r
-Pull: refs/heads/master:&lt;remote&gt;</tt></pre>\r
+<pre><tt>        URL: &lt;url&gt;\r
+        Pull: refs/heads/master:&lt;remote&gt;\r
+</tt></pre>\r
 </div></div>\r
 <p>while having <tt>&lt;url&gt;#&lt;head&gt;</tt> is equivalent to</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>URL: &lt;url&gt;\r
-Pull: refs/heads/&lt;head&gt;:&lt;remote&gt;</tt></pre>\r
+<pre><tt>        URL: &lt;url&gt;\r
+        Pull: refs/heads/&lt;head&gt;:&lt;remote&gt;</tt></pre>\r
 </div></div>\r
 </div>\r
 <h2>MERGE STRATEGIES</h2>\r
@@ -818,7 +821,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 31-Dec-2006 08:29:26 UTC\r
+Last updated 01-Jan-2007 03:20:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-push.html b/git-push.html
index f586e87d2dfb707448a0070ec2172c959eca70ef..746453ced4851a6f3f13474f1eca276b99d9a3b9 100644 (file)
--- a/git-push.html
+++ b/git-push.html
@@ -449,9 +449,10 @@ file in <tt>$GIT_DIR/remotes</tt> directory can be given; the
 named file should be in the following format:</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>URL: one of the above URL format\r
-Push: &lt;refspec&gt;\r
-Pull: &lt;refspec&gt;</tt></pre>\r
+<pre><tt>        URL: one of the above URL format\r
+        Push: &lt;refspec&gt;\r
+        Pull: &lt;refspec&gt;\r
+</tt></pre>\r
 </div></div>\r
 <p>Then such a short-hand is specified in place of\r
 &lt;repository&gt; without &lt;refspec&gt; parameters on the command\r
@@ -463,10 +464,11 @@ be specified for additional branch mappings.</p>
 of <tt>fetch</tt> instead of <tt>Pull:</tt>):</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>[remote "&lt;remote&gt;"]\r
-        url = &lt;url&gt;\r
-        push = &lt;refspec&gt;\r
-        fetch = &lt;refspec&gt;</tt></pre>\r
+<pre><tt>        [remote "&lt;remote&gt;"]\r
+                url = &lt;url&gt;\r
+                push = &lt;refspec&gt;\r
+                fetch = &lt;refspec&gt;\r
+</tt></pre>\r
 </div></div>\r
 <p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be\r
 specified as an older notation short-hand; the named\r
@@ -478,14 +480,15 @@ without the fragment is equivalent to have this in the
 corresponding file in the <tt>$GIT_DIR/remotes/</tt> directory.</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>URL: &lt;url&gt;\r
-Pull: refs/heads/master:&lt;remote&gt;</tt></pre>\r
+<pre><tt>        URL: &lt;url&gt;\r
+        Pull: refs/heads/master:&lt;remote&gt;\r
+</tt></pre>\r
 </div></div>\r
 <p>while having <tt>&lt;url&gt;#&lt;head&gt;</tt> is equivalent to</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>URL: &lt;url&gt;\r
-Pull: refs/heads/&lt;head&gt;:&lt;remote&gt;</tt></pre>\r
+<pre><tt>        URL: &lt;url&gt;\r
+        Pull: refs/heads/&lt;head&gt;:&lt;remote&gt;</tt></pre>\r
 </div></div>\r
 </div>\r
 <h2>Author</h2>\r
@@ -503,7 +506,7 @@ by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 31-Dec-2006 08:29:27 UTC\r
+Last updated 01-Jan-2007 03:20:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/glossary.html b/glossary.html
index d3ba439282edbf4daa2a2016c1b14bd78015d063..d77cbe1c945ef4c8c334184f8a5b3ed49a6bb210 100644 (file)
--- a/glossary.html
+++ b/glossary.html
@@ -660,11 +660,12 @@ div.exampleblock-content {
 </dt>\r
 <dd>\r
 <p>\r
-        The default upstream <a href="#ref_tracking_branch">tracking branch</a>. Most\r
-        projects have at least one upstream project which they track. By default\r
+        The default upstream <a href="#ref_repository">repository</a>. Most projects have\r
+        at least one upstream project which they track. By default\r
         <em><a href="#ref_origin">origin</a></em> is used for that purpose. New upstream updates\r
-        will be fetched into this <a href="#ref_branch">branch</a>; you should never\r
-        <a href="#ref_commit">commit</a> to it yourself.\r
+        will be fetched into remote tracking branches named\r
+        <a href="#ref_origin">origin</a>/name-of-upstream-<a href="#ref_branch">branch</a>, which you\r
+        can see using "git <a href="#ref_branch">branch</a> -r".\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -980,7 +981,7 @@ the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 18-Nov-2006 22:17:51 UTC\r
+Last updated 01-Jan-2007 03:20:17 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/glossary.txt b/glossary.txt
index 894883d7b60c4c79263323fc007406c4f3720bac..7c1a6592c112a76c23c2833537a13f40337c261c 100644 (file)
--- a/glossary.txt
+++ b/glossary.txt
@@ -188,11 +188,12 @@ octopus::
        predator.
 
 origin::
-       The default upstream tracking branch. Most projects have at
+       The default upstream repository. Most projects have at
        least one upstream project which they track. By default
        'origin' is used for that purpose.  New upstream updates
-       will be fetched into this branch; you should never commit
-       to it yourself.
+       will be fetched into remote tracking branches named
+       origin/name-of-upstream-branch, which you can see using
+       "git branch -r".
 
 pack::
        A set of objects which have been compressed into one file (to save

diff --git a/hooks.html b/hooks.html
index 24656155a508b0865e8337aa15a13f6d172ad836..d4faf7f51dc9e1abad95ecca5595482de7171156 100644 (file)
--- a/hooks.html
+++ b/hooks.html
@@ -378,9 +378,9 @@ firing one e-mail per ref when used naively, though.</p>
 <p>Another use suggested on the mailing list is to use this hook to\r
 implement access control which is finer grained than the one\r
 based on filesystem group.</p>\r
-<p>The standard output of this hook is sent to <tt>/dev/null</tt>; if you\r
+<p>The standard output of this hook is sent to <tt>stderr</tt>, so if you\r
 want to report something to the <tt>git-send-pack</tt> on the other end,\r
-you can redirect your output to your <tt>stderr</tt>.</p>\r
+you can simply <tt>echo</tt> your messages.</p>\r
 </div>\r
 <h2>post-update</h2>\r
 <div class="sectionbody">\r
@@ -406,7 +406,7 @@ you can redirect your output to your <tt>stderr</tt>.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:47 UTC\r
+Last updated 01-Jan-2007 03:20:17 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/hooks.txt b/hooks.txt
index 517f49b5cc5016a20b171789b89f48cb6ef0ecd5..161123f142ff231bc8153242d7f6507c54b09e2b 100644 (file)
--- a/hooks.txt
+++ b/hooks.txt
@@ -126,9 +126,9 @@ Another use suggested on the mailing list is to use this hook to
 implement access control which is finer grained than the one
 based on filesystem group.
 
-The standard output of this hook is sent to `/dev/null`; if you
+The standard output of this hook is sent to `stderr`, so if you
 want to report something to the `git-send-pack` on the other end,
-you can redirect your output to your `stderr`.
+you can simply `echo` your messages.
 
 
 post-update

diff --git a/tutorial.html b/tutorial.html
index ddb2dcd196a897e7433a5dad8f5ce79211e5b7c5..6b693d6bc5910c1a7cc1ac9f12c663c96a764f32 100644 (file)
--- a/tutorial.html
+++ b/tutorial.html
@@ -541,18 +541,23 @@ branch, regardless of what else is given on the commandline.</p>
 </div></div>\r
 <p>Note that he doesn't need to give the path to Alice's repository;\r
 when Bob cloned Alice's repository, git stored the location of her\r
-repository in the file .git/remotes/origin, and that location is used\r
-as the default for pulls.</p>\r
-<p>Bob may also notice a branch in his repository that he didn't create:</p>\r
+repository in the repository configuration, and that location is\r
+used for pulls:</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>$ git branch\r
-* master\r
-  origin</tt></pre>\r
+<pre><tt>$ git repo-config --get remote.origin.url\r
+/home/bob/myrepo</tt></pre>\r
+</div></div>\r
+<p>(The complete configuration created by git-clone is visible using\r
+"git repo-config -l", and the <a href="git-repo-config.html">git-repo-config(1)</a> man page\r
+explains the meaning of each option.)</p>\r
+<p>Git also keeps a pristine copy of Alice's master branch under the\r
+name "origin/master":</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ git branch -r\r
+  origin/master</tt></pre>\r
 </div></div>\r
-<p>The "origin" branch, which was created automatically by "git clone",\r
-is a pristine copy of Alice's master branch; Bob should never commit\r
-to it.</p>\r
 <p>If Bob later decides to work from a different host, he can still\r
 perform clones and pulls using the ssh protocol:</p>\r
 <div class="listingblock">\r
@@ -762,7 +767,7 @@ digressions that may be interesting at this point are:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Dec-2006 07:43:53 UTC\r
+Last updated 01-Jan-2007 03:20:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/tutorial.txt b/tutorial.txt
index cb808d924be51e111b3e57b1b6e007cdf9f451bb..d043e844d2303d6c1c79eec50a2cd7621469c5b8 100644 (file)
--- a/tutorial.txt
+++ b/tutorial.txt
@@ -323,20 +323,25 @@ $ git pull
 
 Note that he doesn't need to give the path to Alice's repository;
 when Bob cloned Alice's repository, git stored the location of her
-repository in the file .git/remotes/origin, and that location is used
-as the default for pulls.
-
-Bob may also notice a branch in his repository that he didn't create:
+repository in the repository configuration, and that location is
+used for pulls:
 
 -------------------------------------
-$ git branch
-* master
-  origin
+$ git repo-config --get remote.origin.url
+/home/bob/myrepo
 -------------------------------------
 
-The "origin" branch, which was created automatically by "git clone",
-is a pristine copy of Alice's master branch; Bob should never commit
-to it.
+(The complete configuration created by git-clone is visible using
+"git repo-config -l", and the gitlink:git-repo-config[1] man page
+explains the meaning of each option.)
+
+Git also keeps a pristine copy of Alice's master branch under the
+name "origin/master":
+
+-------------------------------------
+$ git branch -r
+  origin/master
+-------------------------------------
 
 If Bob later decides to work from a different host, he can still
 perform clones and pulls using the ssh protocol:

diff --git a/urls.txt b/urls.txt
index 870c95073bbbb74e6d40ea1dd5dc642410bc9153..745f9677d005b522f52496339abd5afc4267a815 100644 (file)
--- a/urls.txt
+++ b/urls.txt
@@ -41,9 +41,10 @@ file in `$GIT_DIR/remotes` directory can be given; the
 named file should be in the following format:
 
 ------------
-URL: one of the above URL format
-Push: <refspec>
-Pull: <refspec>
+       URL: one of the above URL format
+       Push: <refspec>
+       Pull: <refspec>
+
 ------------
 
 Then such a short-hand is specified in place of
@@ -57,10 +58,11 @@ Or, equivalently, in the `$GIT_DIR/config` (note the use
 of `fetch` instead of `Pull:`):
 
 ------------
-[remote "<remote>"]
-       url = <url>
-       push = <refspec>
-       fetch = <refspec>
+       [remote "<remote>"]
+               url = <url>
+               push = <refspec>
+               fetch = <refspec>
+
 ------------
 
 The name of a file in `$GIT_DIR/branches` directory can be
@@ -73,14 +75,14 @@ without the fragment is equivalent to have this in the
 corresponding file in the `$GIT_DIR/remotes/` directory.
 
 ------------
-URL: <url>
-Pull: refs/heads/master:<remote>
-------------
+       URL: <url>
+       Pull: refs/heads/master:<remote>
 
+------------
 
 while having `<url>#<head>` is equivalent to
 
 ------------
-URL: <url>
-Pull: refs/heads/<head>:<remote>
+       URL: <url>
+       Pull: refs/heads/<head>:<remote>
 ------------