Autogenerated HTML docs for v1.6.3-rc0

Junio C Hamano · Junio C Hamano · commit 98e32c30fcbb · 2009-04-13T02:39:53.000Z
diff --git a/RelNotes-1.6.2.3.txt b/RelNotes-1.6.2.3.txt
@@ -20,9 +20,3 @@ Fixes since v1.6.2.2
   to prevent them from being repacked.
 
 Many small documentation updates are included as well.
-
----
-exec >/var/tmp/1
-echo O=$(git describe maint)
-O=v1.6.2.2-41-gbff82d0
-git shortlog --no-merges $O..maint
diff --git a/RelNotes-1.6.3.txt b/RelNotes-1.6.3.txt
@@ -35,6 +35,8 @@ Updates since v1.6.2
 
 (subsystems)
 
+* various git-svn updates.
+
 (performance)
 
 * many uses of lstat(2) in the codepath for "git checkout" have been
@@ -80,16 +82,21 @@ Updates since v1.6.2
 
 * You can give --date=<format> option to git-blame.
 
-* git-branch -r shows HEAD symref that points at a remote branch in
+* "git-branch -r" shows HEAD symref that points at a remote branch in
   interest of each tracked remote repository.
 
+* "git-branch -v -v" is a new way to get list of names for branches and the
+  "upstream" branch for them.
+
 * git-config learned -e option to open an editor to edit the config file
   directly.
 
 * git-clone runs post-checkout hook when run without --no-checkout.
 
 * git-fast-export choked when seeing a tag that does not point at commit.
 
+* git-for-each-ref learned a new "upstream" token.
+
 * git-format-patch can be told to use attachment with a new configuration,
   format.attach.
 
@@ -118,6 +125,9 @@ Updates since v1.6.2
 
 * Output from git-remote command has been vastly improved.
 
+* "git remote update --prune $remote" updates from the named remote and
+  then prunes stale tracking branches.
+
 * git-send-email learned --confirm option to review the Cc: list before
   sending the messages out.
 
@@ -166,6 +176,6 @@ v1.6.2.X series.
 
 ---
 exec >/var/tmp/1
-O=v1.6.2.2-484-g796b137
+O=v1.6.2.3-497-g54a4749
 echo O=$(git describe master)
 git shortlog --no-merges $O..master ^maint
diff --git a/config.txt b/config.txt
@@ -1215,7 +1215,7 @@ push.default::
 * `matching` push all matching branches.
   All branches having the same name in both ends are considered to be
   matching. This is the default.
-* `tracking` push the current branch to the branch it is tracking.
+* `tracking` push the current branch to its upstream branch.
 * `current` push the current branch to a branch of the same name.
 
 rebase.stat::
diff --git a/git-branch.html b/git-branch.html
@@ -461,7 +461,9 @@ <h2 id="_options">OPTIONS</h2>
 </dt>
 <dd>
 <p>
-        Show sha1 and commit subject line for each head.
+        Show sha1 and commit subject line for each head, along with
+        relationship to upstream branch (if any). If given twice, print
+        the name of the upstream branch, as well.
 </p>
 </dd>
 <dt>
@@ -665,7 +667,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-04-02 06:49:45 UTC
+Last updated 2009-04-13 02:39:28 UTC
 </div>
 </div>
 </body>
diff --git a/git-branch.txt b/git-branch.txt
@@ -100,7 +100,9 @@ OPTIONS
 
 -v::
 --verbose::
-	Show sha1 and commit subject line for each head.
+	Show sha1 and commit subject line for each head, along with
+	relationship to upstream branch (if any). If given twice, print
+	the name of the upstream branch, as well.
 
 --abbrev=<length>::
 	Alter the sha1's minimum display length in the output listing.
diff --git a/git-config.html b/git-config.html
@@ -2864,7 +2864,7 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
 </li>
 <li>
 <p>
-<tt>tracking</tt> push the current branch to the branch it is tracking.
+<tt>tracking</tt> push the current branch to its upstream branch.
 </p>
 </li>
 <li>
@@ -3219,7 +3219,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-04-06 08:26:29 UTC
+Last updated 2009-04-13 02:39:28 UTC
 </div>
 </div>
 </body>
diff --git a/git-filter-branch.html b/git-filter-branch.html
@@ -342,6 +342,8 @@ <h2 id="_description">DESCRIPTION</h2>
 changes, which would normally have no effect.  Nevertheless, this may be
 useful in the future for compensating for some git bugs or such,
 therefore such a usage is permitted.</p></div>
+<div class="para"><p><strong>NOTE</strong>: This command honors <tt>.git/info/grafts</tt>. If you have any grafts
+defined, running this command will make them permanent.</p></div>
 <div class="para"><p><strong>WARNING</strong>! The rewritten history will have different object names for all
 the objects and will not converge with the original branch.  You will not
 be able to easily push and distribute the rewritten branch on top of the
@@ -760,7 +762,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-04-02 06:49:52 UTC
+Last updated 2009-04-13 02:39:28 UTC
 </div>
 </div>
 </body>
diff --git a/git-filter-branch.txt b/git-filter-branch.txt
@@ -31,6 +31,9 @@ changes, which would normally have no effect.  Nevertheless, this may be
 useful in the future for compensating for some git bugs or such,
 therefore such a usage is permitted.
 
+*NOTE*: This command honors `.git/info/grafts`. If you have any grafts
+defined, running this command will make them permanent.
+
 *WARNING*! The rewritten history will have different object names for all
 the objects and will not converge with the original branch.  You will not
 be able to easily push and distribute the rewritten branch on top of the
diff --git a/git-for-each-ref.html b/git-for-each-ref.html
@@ -448,6 +448,16 @@ <h2 id="_field_names">FIELD NAMES</h2>
         The object name (aka SHA-1).
 </p>
 </dd>
+<dt>
+upstream
+</dt>
+<dd>
+<p>
+        The name of a local ref which can be considered &#8220;upstream&#8221;
+        from the displayed ref. Respects <tt>:short</tt> in the same way as
+        <tt>refname</tt> above.
+</p>
+</dd>
 </dl></div>
 <div class="para"><p>In addition to the above, for commit and tag objects, the header
 field names (<tt>tree</tt>, <tt>parent</tt>, <tt>object</tt>, <tt>type</tt>, and <tt>tag</tt>) can
@@ -554,7 +564,7 @@ <h2 id="_examples">EXAMPLES</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-04-02 06:49:52 UTC
+Last updated 2009-04-13 02:39:29 UTC
 </div>
 </div>
 </body>
diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt
@@ -85,6 +85,11 @@ objectsize::
 objectname::
 	The object name (aka SHA-1).
 
+upstream::
+	The name of a local ref which can be considered ``upstream''
+	from the displayed ref. Respects `:short` in the same way as
+	`refname` above.
+
 In addition to the above, for commit and tag objects, the header
 field names (`tree`, `parent`, `object`, `type`, and `tag`) can
 be used to specify the value in the header field.
diff --git a/git-remote.html b/git-remote.html
@@ -328,7 +328,7 @@ <h2>SYNOPSIS</h2>
 <em>git remote set-head</em> &lt;name&gt; [-a | -d | &lt;branch&gt;]
 <em>git remote show</em> [-n] &lt;name&gt;
 <em>git remote prune</em> [-n | --dry-run] &lt;name&gt;
-<em>git remote update</em> [group]</div></div>
+<em>git remote update</em> [-p | --prune] [group | remote]&#8230;</div></div>
 </div>
 <h2 id="_description">DESCRIPTION</h2>
 <div class="sectionbody">
@@ -459,6 +459,7 @@ <h2 id="_commands">COMMANDS</h2>
 configuration parameter remote.&lt;name&gt;.skipDefaultUpdate set to true will
 be updated.  (See <a href="git-config.html">git-config(1)</a>).
 </p>
+<div class="para"><p>With <tt>--prune</tt> option, prune all the remotes that are updated.</p></div>
 </dd>
 </dl></div>
 </div>
@@ -530,7 +531,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-04-02 06:50:01 UTC
+Last updated 2009-04-13 02:39:29 UTC
 </div>
 </div>
 </body>
diff --git a/git-remote.txt b/git-remote.txt
@@ -16,7 +16,7 @@ SYNOPSIS
 'git remote set-head' <name> [-a | -d | <branch>]
 'git remote show' [-n] <name>
 'git remote prune' [-n | --dry-run] <name>
-'git remote update' [group]
+'git remote update' [-p | --prune] [group | remote]...
 
 DESCRIPTION
 -----------
@@ -125,6 +125,8 @@ the configuration parameter remotes.default will get used; if
 remotes.default is not defined, all remotes which do not have the
 configuration parameter remote.<name>.skipDefaultUpdate set to true will
 be updated.  (See linkgit:git-config[1]).
++
+With `--prune` option, prune all the remotes that are updated.
 
 
 DISCUSSION
diff --git a/git.html b/git.html
@@ -2034,7 +2034,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-04-08 07:36:12 UTC
+Last updated 2009-04-13 02:39:29 UTC
 </div>
 </div>
 </body>
diff --git a/git.txt b/git.txt
@@ -43,9 +43,11 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.6.2.1/git.html[documentation for release 1.6.2.1]
+* link:v1.6.2.3/git.html[documentation for release 1.6.2.3]
 
 * release notes for
+  link:RelNotes-1.6.2.3.txt[1.6.2.3],
+  link:RelNotes-1.6.2.2.txt[1.6.2.2],
   link:RelNotes-1.6.2.1.txt[1.6.2.1],
   link:RelNotes-1.6.2.txt[1.6.2].
 
diff --git a/gitglossary.html b/gitglossary.html
@@ -1130,6 +1130,17 @@ <h2 id="_description">DESCRIPTION</h2>
 </p>
 </dd>
 <dt>
+<a id="def_upstream_branch"></a>upstream branch
+</dt>
+<dd>
+<p>
+        The default <a href="#def_branch">branch</a> that is merged into the branch in
+        question (or the branch in question is rebased onto). It is configured
+        via branch.&lt;name&gt;.remote and branch.&lt;name&gt;.merge. If the upstream branch
+        of <em>A</em> is <em>origin/B</em> sometimes we say "<em>A</em> is tracking <em>origin/B</em>".
+</p>
+</dd>
+<dt>
 <a id="def_working_tree"></a>working tree
 </dt>
 <dd>
@@ -1155,7 +1166,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-04-02 06:50:11 UTC
+Last updated 2009-04-13 02:39:30 UTC
 </div>
 </div>
 </body>
diff --git a/glossary-content.txt b/glossary-content.txt
@@ -449,6 +449,12 @@ This commit is referred to as a "merge commit", or sometimes just a
 	An <<def_object,object>> which is not <<def_reachable,reachable>> from a
 	<<def_branch,branch>>, <<def_tag,tag>>, or any other reference.
 
+[[def_upstream_branch]]upstream branch::
+	The default <<def_branch,branch>> that is merged into the branch in
+	question (or the branch in question is rebased onto). It is configured
+	via branch.<name>.remote and branch.<name>.merge. If the upstream branch
+	of 'A' is 'origin/B' sometimes we say "'A' is tracking 'origin/B'".
+
 [[def_working_tree]]working tree::
 	The tree of actual checked out files.  The working tree is
 	normally equal to the <<def_HEAD,HEAD>> plus any local changes
diff --git a/user-manual.html b/user-manual.html
