Autogenerated HTML docs for v1.5.2-rc3

diff --git a/RelNotes-1.5.2.txt b/RelNotes-1.5.2.txt
index c14f3da7aa76b7bfbe302bc2de5eaa799dfa071c..42e7fa5beccd0a2b5c0b2703cf62034cb1b23ab9 100644 (file)
--- a/RelNotes-1.5.2.txt
+++ b/RelNotes-1.5.2.txt
@@ -44,6 +44,11 @@ Updates since v1.5.1
 
 * Comes with an updated git-gui 0.7.0
 
+* Updated gitweb:
+
+  - can show combined diff for merges;
+  - uses font size of user's preference, not hardcoded in pixels;
+
 * New commands and options.
 
   - "git bisect start" can optionally take a single bad commit and
@@ -141,6 +146,8 @@ Updates since v1.5.1
   - Optimized "git-add $path" in a large directory, most of
     whose contents are ignored.
 
+  - Optimized "git-diff-tree" for reduced memory footprint.
+
   - The recursive merge strategy updated a worktree file that
     was changed identically in two branches, when one of them
     renamed it.  We do not do that when there is no rename, so
@@ -187,6 +194,6 @@ this release, unless otherwise noted.
 
 --
 exec >/var/tmp/1
-O=v1.5.2-rc2-45-g618e613
+O=v1.5.2-rc2-91-g616e40b
 echo O=`git describe refs/heads/master`
 git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint

diff --git a/git-fast-import.html b/git-fast-import.html
index 6d74817ebcd4796666596e9b090f04402071ad99..f92cf9aa23256113d43e02d1827d12723742131a 100644 (file)
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -891,8 +891,7 @@ lightweight (non-annotated) tags see the <tt>reset</tt> command below.</p>
 <pre><tt>        'tag' SP &lt;name&gt; LF\r
         'from' SP &lt;committish&gt; LF\r
         'tagger' SP &lt;name&gt; SP LT &lt;email&gt; GT SP &lt;when&gt; LF\r
-        data\r
-        LF</tt></pre>\r
+        data</tt></pre>\r
 </div></div>\r
 <p>where <tt>&lt;name&gt;</tt> is the name of the tag to create.</p>\r
 <p>Tag names are automatically prefixed with <tt>refs/tags/</tt> when stored\r
@@ -1204,7 +1203,7 @@ memory footprint (less than 2.7 MiB per active branch).</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:40 UTC\r
+Last updated 10-May-2007 23:24:40 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fast-import.txt b/git-fast-import.txt
index eaba6fd4c168564f43ce2db3994dcb7b70bd4b54..8d06775a6bd5f4ac8bd5a20fba67f76c121380ee 100644 (file)
--- a/git-fast-import.txt
+++ b/git-fast-import.txt
@@ -548,7 +548,6 @@ lightweight (non-annotated) tags see the `reset` command below.
        'from' SP <committish> LF
        'tagger' SP <name> SP LT <email> GT SP <when> LF
        data
-       LF
 ....
 
 where `<name>` is the name of the tag to create.

diff --git a/git-log.html b/git-log.html
index 55c0ac40a2cc23b2575dde4b6c902984562a5d77..be935423fc67e4beff70ae71d6dd5a272ec44ac9 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -629,6 +629,14 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff
 </p>\r
 </dd>\r
 <dt>\r
+--decorate\r
+</dt>\r
+<dd>\r
+<p>\r
+    Print out the ref names of any commits that are shown.\r
+</p>\r
+</dd>\r
+<dt>\r
 &lt;paths&gt;&#8230;\r
 </dt>\r
 <dd>\r
@@ -771,7 +779,7 @@ reversible operation.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Apr-2007 01:28:35 UTC\r
+Last updated 10-May-2007 23:24:40 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.txt b/git-log.txt
index 49bb539dea6ad86fa8844cf6bbe27a74af41b4e4..dd06527a1e1b421ca867fa8bca0c36ccb75aeea6 100644 (file)
--- a/git-log.txt
+++ b/git-log.txt
@@ -51,6 +51,9 @@ include::pretty-formats.txt[]
        a record about how the tip of a reference was changed.
        See also gitlink:git-reflog[1].
 
+--decorate::
+    Print out the ref names of any commits that are shown.
+
 <paths>...::
        Show only commits that affect the specified paths.
 

diff --git a/git-rev-parse.html b/git-rev-parse.html
index 64f468941e87ba5d099ebf749d845d9c7f8f50a3..20bbf50bda58e73394f4ac6db73a4024db152fc8 100644 (file)
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -675,7 +675,7 @@ reachable from <tt>r1</tt> from the set of commits reachable from
 <p>A similar notation "<tt>r1...r2</tt>" is called symmetric difference\r
 of <tt>r1</tt> and <tt>r2</tt> and is defined as\r
 "<tt>r1 r2 --not $(git-merge-base --all r1 r2)</tt>".\r
-It it the set of commits that are reachable from either one of\r
+It is the set of commits that are reachable from either one of\r
 <tt>r1</tt> or <tt>r2</tt> but not from both.</p>\r
 <p>Two other shorthands for naming a set that is formed by a commit\r
 and its parent commits exists.  <tt>r1^@</tt> notation means all\r
@@ -709,7 +709,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:13 UTC\r
+Last updated 10-May-2007 23:24:42 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-parse.txt b/git-rev-parse.txt
index a8bf6561e1d8059f12d1a548cf74dc4815e6a34f..7757abe62190a066b6ad8b57214b70ff3fa0f12a 100644 (file)
--- a/git-rev-parse.txt
+++ b/git-rev-parse.txt
@@ -255,7 +255,7 @@ reachable from `r1` from the set of commits reachable from
 A similar notation "`r1\...r2`" is called symmetric difference
 of `r1` and `r2` and is defined as
 "`r1 r2 --not $(git-merge-base --all r1 r2)`".
-It it the set of commits that are reachable from either one of
+It is the set of commits that are reachable from either one of
 `r1` or `r2` but not from both.
 
 Two other shorthands for naming a set that is formed by a commit