Autogenerated HTML docs for v1.5.1.1-159-g2c78

diff --git a/RelNotes-1.5.1.2.txt b/RelNotes-1.5.1.2.txt
new file mode 100644 (file)
index 0000000..f58268f
--- /dev/null
+++ b/RelNotes-1.5.1.2.txt
@@ -0,0 +1,37 @@
+GIT v1.5.1.2 Release Notes (draft)
+==========================
+
+Fixes since v1.5.1.1
+--------------------
+
+* Bugfixes
+
+  - "git diff a/ b/" incorrectly fell in "diff between two
+    filesystem objects" codepath, when the user most likely
+    wanted to limit the extent of output to two tracked
+    directories.
+
+  - git-quiltimport had the same bug as we fixed for
+    git-applymbox in v1.5.1.1 -- it gave an alarming "did not
+    have any patch" message (but did not actually fail and was
+    harmless).
+
+  - various git-svn fixes.
+
+  - Sample update hook incorrectly always refused requests to
+    delete branches through push.
+
+  - git-blame on a very long working tree path had buffer
+    overrun problem.
+
+* Documentation updates
+
+  - Various documentation updates from J. Bruce Fields, Frank
+    Lichtenheld, Alex Riesen and others.  Andrew Ruder started a
+    war on undocumented options.
+
+---
+exec >/var/tmp/1
+O=v1.5.1.1-31-g0220f1e
+echo O=`git describe refs/heads/maint`
+git shortlog --no-merges $O..refs/heads/maint

diff --git a/RelNotes-1.5.2.txt b/RelNotes-1.5.2.txt
index 2e3c7bc4f1cd39833f741dd2359f1b226c75a699..d93da608c70c3544963ad7dfd50ca12d39bc7fa9 100644 (file)
--- a/RelNotes-1.5.2.txt
+++ b/RelNotes-1.5.2.txt
@@ -9,6 +9,14 @@ Updates since v1.5.1
   - "git bisect start" can optionally take a single bad commit and
     zero or more good commits on the command line.
 
+  - "git shortlog" can optionally be told to wrap its output.
+
+  - "subtree" merge strategy allows another project to be merged in as
+    your subdirectory.
+
+  - "git format-patch" learned a new --subject-prefix=<string>
+    option, to override the built-in "[PATCH]".
+
 * Updated behavior of existing commands.
 
   - "git diff --stat" shows size of preimage and postimage blobs
@@ -27,6 +35,12 @@ Updates since v1.5.1
     the root commit).  We used to refuse to operate without a
     good and a bad commit.
 
+  - "git push", when pushing into more than one repository, does
+    not stop at the first error.
+
+  - "git archive" does not insist you to give --format parameter
+    anymore; it defaults to "tar".
+
 * Builds
 
   - git-p4import has never been installed; now there is an
@@ -55,8 +69,30 @@ The following are all in v1.5.1.x series, unless otherwise noted.
 
 * Documentation updates
 
+  - Various documentation updates from J. Bruce Fields, Frank
+    Lichtenheld, Alex Riesen and others.  Andrew Ruder started a
+    war on undocumented options.
+
 * Bugfixes
 
+  - "git diff a/ b/" incorrectly fell in "diff between two
+    filesystem objects" codepath, when the user most likely
+    wanted to limit the extent of output to two tracked
+    directories.
+
+  - git-quiltimport had the same bug as we fixed for
+    git-applymbox in v1.5.1.1 -- it gave an alarming "did not
+    have any patch" message (but did not actually fail and was
+    harmless).
+
+  - various git-svn fixes.
+
+  - Sample update hook incorrectly always refused requests to
+    delete branches through push.
+
+  - git-blame on a very long working tree path had buffer
+    overrun problem.
+
   - Switching branches with "git checkout" refused to work when
     a path changes from a file to a directory between the
     current branch and the new branch, in order not to lose
@@ -67,10 +103,17 @@ The following are all in v1.5.1.x series, unless otherwise noted.
     been backported to 1.5.1.x series, as it is rather an
     intrusive change.
 
+  - Merging branches that have a file in one and a directory in
+    another at the same path used to get quite confused.  We
+    handle such a case a bit more carefully, even though that is
+    still left as a conflict for the user to sort out.  This
+    will not be backported to 1.5.1.x series, as it is rather an
+    intrusive change.
+
 * Performance Tweaks
 
 --
 exec >/var/tmp/1
-O=v1.5.1-91-g640ee0d
+O=v1.5.1.1-158-g86da9de
 echo O=`git describe refs/heads/master`
 git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint

diff --git a/git-rm.html b/git-rm.html
index 795fe544dca55ebbf332c97df282a62a9acd6e90..65b7e3ee32e5d0021e2d6be9d7a0c2bd9fc831ba 100644 (file)
--- a/git-rm.html
+++ b/git-rm.html
@@ -272,7 +272,7 @@ git-rm(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-rm</em> [-f] [-n] [-r] [--cached] [--] &lt;file&gt;&#8230;</p>\r
+<p><em>git-rm</em> [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] &lt;file&gt;&#8230;</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -343,6 +343,14 @@ area (aka index).</p>
 </p>\r
 </dd>\r
 <dt>\r
+--ignore-unmatch\r
+</dt>\r
+<dd>\r
+<p>\r
+        Exit with a zero status even if no files matched.\r
+</p>\r
+</dd>\r
+<dt>\r
 --quiet\r
 </dt>\r
 <dd>\r
@@ -406,7 +414,7 @@ git-rm -f git-*.sh
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 17-Apr-2007 08:27:41 UTC\r
+Last updated 18-Apr-2007 04:57:05 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rm.txt b/git-rm.txt
index b051ccb6d6d47d7fdb41ba27e3e42c82a4460608..a65f24a0f698eb801ac43bba5aa7dc746e96edc0 100644 (file)
--- a/git-rm.txt
+++ b/git-rm.txt
@@ -7,7 +7,7 @@ git-rm - Remove files from the working tree and from the index
 
 SYNOPSIS
 --------
-'git-rm' [-f] [-n] [-r] [--cached] [--] <file>...
+'git-rm' [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...
 
 DESCRIPTION
 -----------
@@ -47,6 +47,9 @@ OPTIONS
        the paths only from the index, leaving working tree
        files.
 
+\--ignore-unmatch::
+       Exit with a zero status even if no files matched.
+
 \--quiet::
        git-rm normally outputs one line (in the form of an "rm" command)
        for each file removed. This option suppresses that output.