Autogenerated HTML docs for v1.5.3.3-131-g34c6d

diff --git a/RelNotes-1.5.3.3.txt b/RelNotes-1.5.3.3.txt
index e91bd84162456e54a565551eff3101f3eb261f3e..2a7bfdd5cc7b0a9494f3f151ba593146553a4945 100644 (file)
--- a/RelNotes-1.5.3.3.txt
+++ b/RelNotes-1.5.3.3.txt
@@ -29,9 +29,3 @@ Fixes since v1.5.3.2
 
  * git-log sometimes invoked underlying "diff" machinery
    unnecessarily.
-
---
-exec >/var/tmp/1
-O=v1.5.3.2-29-gb7bb760
-echo O=`git describe refs/heads/maint`
-git shortlog --no-merges $O..refs/heads/maint

diff --git a/RelNotes-1.5.3.4.txt b/RelNotes-1.5.3.4.txt
new file mode 100644 (file)
index 0000000..47ba287
--- /dev/null
+++ b/RelNotes-1.5.3.4.txt
@@ -0,0 +1,28 @@
+GIT v1.5.3.4 Release Notes
+==========================
+
+Fixes since v1.5.3.3
+--------------------
+
+ * Sample 'post-receive-hook' incorrectly sent out push
+   notification e-mails marked as "From: " the committer of the
+   commit that happened to be at the tip of the branch that was
+   pushed, not from the person who pushed.
+
+ * git-remote did not exit non-zero status upon error.
+
+ * "git-add -i" did not respond very well to EOF from tty nor
+   bogus input.
+
+ * "git rebase -i" squash subcommand incorrectly made the
+   author of later commit the author of resulting commit,
+   instead of taking from the first one in the squashed series.
+
+ * "git stash apply --index" was not documented.
+
+
+--
+exec >/var/tmp/1
+O=v1.5.3.3-6-g0bdcac5
+echo O=`git describe refs/heads/maint`
+git shortlog --no-merges $O..refs/heads/maint

diff --git a/git-stash.html b/git-stash.html
index ec8f78fcc030f391f510aca6ad6a03e1ee0b4b3d..7c27cc9092940c53a1acf416dca26470cf80c0b8 100644 (file)
--- a/git-stash.html
+++ b/git-stash.html
@@ -338,7 +338,7 @@ show [<stash>]
 </p>\r
 </dd>\r
 <dt>\r
-apply [&lt;stash&gt;]\r
+apply [--index] [&lt;stash&gt;]\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -348,6 +348,10 @@ apply [&lt;stash&gt;]
 </p>\r
 <p>This operation can fail with conflicts; you need to resolve them\r
 by hand in the working tree.</p>\r
+<p>If the <tt>--index</tt> option is used, then tries to reinstate not only the working\r
+tree's changes, but also the index's ones. However, this can fail, when you\r
+have conflicts (which are stored in the index, where you therefore can no\r
+longer apply the changes as they were originally).</p>\r
 </dd>\r
 <dt>\r
 clear\r
@@ -456,7 +460,7 @@ $ git stash apply
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Aug-2007 09:20:37 UTC\r
+Last updated 01-Oct-2007 16:22:45 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-stash.txt b/git-stash.txt
index 05f40cff6cbaa9d8a08176a5a601b7e43d17e5bf..5723bb06f087f62e463b110686b850987103140d 100644 (file)
--- a/git-stash.txt
+++ b/git-stash.txt
@@ -63,7 +63,7 @@ show [<stash>]::
        it will accept any format known to `git-diff` (e.g., `git-stash show
        -p stash@\{1}` to view the second most recent stash in patch form).
 
-apply [<stash>]::
+apply [--index] [<stash>]::
 
        Restore the changes recorded in the stash on top of the current
        working tree state.  When no `<stash>` is given, applies the latest
@@ -71,6 +71,11 @@ apply [<stash>]::
 +
 This operation can fail with conflicts; you need to resolve them
 by hand in the working tree.
++
+If the `--index` option is used, then tries to reinstate not only the working
+tree's changes, but also the index's ones. However, this can fail, when you
+have conflicts (which are stored in the index, where you therefore can no
+longer apply the changes as they were originally).
 
 clear::
        Remove all the stashed states. Note that those states will then

diff --git a/git.html b/git.html
index daeb59d4aa4f713b37bba24828efe9082b148e96..1a0faebd6483473c6da1ac0a3d0f61cc51c494be 100644 (file)
--- a/git.html
+++ b/git.html
@@ -1957,7 +1957,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Sep-2007 10:39:22 UTC\r
+Last updated 01-Oct-2007 16:22:45 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index cb59639f777889cb909933886d31ebcce1bbd199..abce801e48386e07fb4014ad596d1b0ad1d382a1 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -46,6 +46,7 @@ Documentation for older releases are available here:
 * link:v1.5.3/git.html[documentation for release 1.5.3]
 
 * release notes for
+  link:RelNotes-1.5.3.3.txt[1.5.3.3],
   link:RelNotes-1.5.3.2.txt[1.5.3.2],
   link:RelNotes-1.5.3.1.txt[1.5.3.1].