summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-04-03 21:52:14 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-04-03 21:52:14 -0700
commit045f5759c97746589a067461e50fad16f60711ac (patch)
tree3eaaef6c395bbe17ca26620dc98fb6b128721640 /Documentation
parentDocumentation: A few minor fixes to Git User's Manual (diff)
parentGIT 1.5.0.7 (diff)
downloadtgif-045f5759c97746589a067461e50fad16f60711ac.tar.xz
Merge 1.5.0.7 in
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.