Merge 1.5.0.7 in

Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-03 21:52:14 -07:00
parent 04483524ec 9694ec4533
commit 045f5759c9
3 changed files with 44 additions and 4 deletions
--- a/Documentation/RelNotes-1.5.0.7.txt
+++ b/Documentation/RelNotes-1.5.0.7.txt
@ -0,0 +1,18 @@
+GIT v1.5.0.7 Release Notes
+==========================
+
+Fixes since v1.5.0.6
+--------------------
+
+* Bugfixes
+
+  - git-upload-pack failed to close unused pipe ends, resulting
+    in many zombies to hang around.
+
+  - git-rerere was recording the contents of earlier hunks
+    duplicated in later hunks.  This prevented resolving the same
+    conflict when performing the same merge the other way around.
+
+* Documentation
+
+  - a few documentation fixes from Debian package maintainer.