path: root/Documentation/RelNotes-
diff options
authorJunio C Hamano <>2007-02-26 07:58:50 (GMT)
committerJunio C Hamano <>2007-02-26 08:26:06 (GMT)
commit0d9b9ab1284ce125fd49cf7dbf4d28e0540cf035 (patch)
tree7a2190291d373e37b469280293570733ee0ed5aa /Documentation/RelNotes-
parent4e5104c1fc42e440b9f086d428157d45897e1273 (diff)
Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/RelNotes-')
1 files changed, 17 insertions, 11 deletions
diff --git a/Documentation/RelNotes- b/Documentation/RelNotes-
index 4dc1344..b061e50 100644
--- a/Documentation/RelNotes-
+++ b/Documentation/RelNotes-
@@ -6,6 +6,14 @@ Fixes since v1.5.0.1
* Bugfixes
+ - Automated merge conflict handling when changes to symbolic
+ links conflicted were completely broken. The merge-resolve
+ strategy created a regular file with conflict markers in it
+ in place of the symbolic link. The default strategy,
+ merge-recursive was even more broken. It removed the path
+ that was pointed at by the symbolic link. Both of these
+ problems have been fixed.
- 'git diff maint master next' did not correctly give combined
diff across three trees.
@@ -39,21 +47,19 @@ Fixes since v1.5.0.1
impossible to repack after accumulating many (small) packs
in the repository.
+ - 'git-diff' to review the combined diff during a conflicted
+ merge were not reading the working tree version correctly
+ when changes to a symbolic link conflicted. It should have
+ read the data using readlink(2) but read from the regular
+ file the symbolic link pointed at.
+ - 'git-remote' did not like period in a remote's name.
* Documentation updates
- added and clarified core.bare, core.legacyheaders configurations.
- updated "git-clone --depth" documentation.
-* Assorted git-gui fixes.
-exec >/var/tmp/1
-echo O=`git describe maint`
-git shortlog --no-merges $O..maint
-#Local Variables:
-#mode: text
+* Assorted git-gui fixes.