Git 1.6.5.6

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

diff --git a/Documentation/RelNotes-1.6.5.6.txt b/Documentation/RelNotes-1.6.5.6.txt
new file mode 100644 (file)
index 0000000..a9eaf76
--- /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 8e93d35e440818b1181e72a7453602ae8d377fc9..c1fcfffebdddf216f63f1eb65a8b7f9495c643ae 100644 (file)
--- 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 0c9be2080bccacc9c11ee3db1a24828e7ae7d576..9c945d91cb7eb3898d4ff09f457e7f529cf67121 100755 (executable)
--- 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 5b19dba037484d1a5618621e9a56e164f697c11d..115c33553bb99a5ac6c21c2ac0f33ab7b48a4901 120000 (symlink)
--- 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