From: Junio C Hamano Date: Thu, 10 Dec 2009 23:42:30 +0000 (-0800) Subject: Git 1.6.5.6 X-Git-Tag: v1.6.5.6 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=61baffe6a3c7dbcb1b19f1edcc143e4f8140201c;p=git.git Git 1.6.5.6 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/RelNotes-1.6.5.6.txt b/Documentation/RelNotes-1.6.5.6.txt new file mode 100644 index 000000000..a9eaf76f6 --- /dev/null +++ b/Documentation/RelNotes-1.6.5.6.txt @@ -0,0 +1,23 @@ +Git v1.6.5.6 Release Notes +========================== + +Fixes since v1.6.5.5 +-------------------- + + * "git add -p" had a regression since v1.6.5.3 that broke deletion of + non-empty files. + + * "git archive -o o.zip -- Makefile" produced an archive in o.zip + but in POSIX tar format. + + * Error message given to "git pull --rebase" when the user didn't give + enough clue as to what branch to integrate with still talked about + "merging with" the branch. + + * Error messages given by "git merge" when the merge resulted in a + fast-forward still were in plumbing lingo, even though in v1.6.5 + we reworded messages in other cases. + + * The post-upload-hook run by upload-pack in response to "git fetch" has + been removed, due to security concerns (the hook first appeared in + 1.6.5). diff --git a/Documentation/git.txt b/Documentation/git.txt index 8e93d35e4..c1fcfffeb 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.6.5.5/git.html[documentation for release 1.6.5.5] +* link:v1.6.5.6/git.html[documentation for release 1.6.5.6] * release notes for + link:RelNotes-1.6.5.6.txt[1.6.5.6], link:RelNotes-1.6.5.5.txt[1.6.5.5], link:RelNotes-1.6.5.4.txt[1.6.5.4], link:RelNotes-1.6.5.3.txt[1.6.5.3], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 0c9be2080..9c945d91c 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.6.5.5 +DEF_VER=v1.6.5.6 LF=' ' diff --git a/RelNotes b/RelNotes index 5b19dba03..115c33553 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.6.5.5.txt \ No newline at end of file +Documentation/RelNotes-1.6.5.6.txt \ No newline at end of file