From: Junio C Hamano <junkio@cox.net>
Date: Tue, 3 Apr 2007 18:31:21 +0000 (-0700)
Subject: GIT 1.5.0.7
X-Git-Tag: v1.5.0.7^0
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9694ec4533b30c1299e9ce7742c65c78b4fa3c5d;p=git.git

GIT 1.5.0.7

Not that this release really matters, as we will be doing
1.5.1 tomorrow.  This commit is to tie the loose ends and
merge all of "maint" branch into "master" in preparation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Documentation/RelNotes-1.5.0.7.txt b/Documentation/RelNotes-1.5.0.7.txt
new file mode 100644
index 000000000..670ad32b8
--- /dev/null
+++ 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.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 6abd4cfc9..721330948 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.0.6.GIT
+DEF_VER=v1.5.0.7.GIT
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index 4e145f302..1126dfef4 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.5.0.6.txt
\ No newline at end of file
+Documentation/RelNotes-1.5.0.7.txt
\ No newline at end of file