summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-04-03 11:31:21 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-04-03 19:27:41 -0700
commit9694ec4533b30c1299e9ce7742c65c78b4fa3c5d (patch)
tree1b0bc8effdbd2f43cc0486b54e1cb18d952f18c2 /Documentation
parentrerere should not repeat the earlier hunks in later ones (diff)
downloadtgif-9694ec4533b30c1299e9ce7742c65c78b4fa3c5d.tar.xz
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes-1.5.0.7.txt18
1 files changed, 18 insertions, 0 deletions
diff --git a/Documentation/RelNotes-1.5.0.7.txt b/Documentation/RelNotes-1.5.0.7.txt
new file mode 100644
index 0000000000..670ad32b85
--- /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.