Whip post 1.5.3.3 maintenance series into shape.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes-1.5.3.3.txt b/Documentation/RelNotes-1.5.3.3.txt
index e91bd84162456e54a565551eff3101f3eb261f3e..2a7bfdd5cc7b0a9494f3f151ba593146553a4945 100644 (file)
--- a/Documentation/RelNotes-1.5.3.3.txt
+++ b/Documentation/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/Documentation/RelNotes-1.5.3.4.txt b/Documentation/RelNotes-1.5.3.4.txt
new file mode 100644 (file)
index 0000000..47ba287
--- /dev/null
+++ b/Documentation/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-VERSION-GEN b/GIT-VERSION-GEN
index 7fbde233b86812b2bda51878cf4d09ad18c2062b..6de899a4659497afab3c64f10442a79d10965896 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.3.2.GIT
+DEF_VER=v1.5.3.3.GIT
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 44b610e8f896c836a1a60133ac87c93969f8568f..9829b436cbbcce672ed9f030e9577f6f08a9d6d3 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.5.3.3.txt
\ No newline at end of file
+Documentation/RelNotes-1.5.3.4.txt
\ No newline at end of file