summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-03 18:31:21 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-04 02:27:41 (GMT)
commit9694ec4533b30c1299e9ce7742c65c78b4fa3c5d (patch)
tree1b0bc8effdbd2f43cc0486b54e1cb18d952f18c2
parenteb3359663d62f35999330797455dbe738bd5ed99 (diff)
downloadgit-9694ec4533b30c1299e9ce7742c65c78b4fa3c5d.zip
git-9694ec4533b30c1299e9ce7742c65c78b4fa3c5d.tar.gz
git-9694ec4533b30c1299e9ce7742c65c78b4fa3c5d.tar.bz2
GIT 1.5.0.7v1.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>
-rw-r--r--Documentation/RelNotes-1.5.0.7.txt18
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 20 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.5.0.7.txt b/Documentation/RelNotes-1.5.0.7.txt
new file mode 100644
index 0000000..670ad32
--- /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 6abd4cf..7213309 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 4e145f3..1126dfe 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