From 5946d4ba8970f00bb62b2c9e8714264831034043 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 1 Oct 2007 02:07:47 -0700 Subject: [PATCH] Whip post 1.5.3.3 maintenance series into shape. Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.3.3.txt | 6 ------ Documentation/RelNotes-1.5.3.4.txt | 28 ++++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 Documentation/RelNotes-1.5.3.4.txt diff --git a/Documentation/RelNotes-1.5.3.3.txt b/Documentation/RelNotes-1.5.3.3.txt index e91bd8416..2a7bfdd5c 100644 --- 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 index 000000000..47ba2870a --- /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 7fbde233b..6de899a46 100755 --- 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 44b610e8f..9829b436c 120000 --- 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 -- 2.30.2