X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2FRelNotes-1.6.0.1.txt;h=49d7a1cafabd129e392b48b85a9641b7f5ddb828;hb=f324cb50be3d88c6fb6123c85da749695a749f60;hp=bac117e89d5553710d203a2c5adfb12a67962ff2;hpb=f02fa3360510c6a2b75d2b52b8d1636788ab2605;p=git.git

diff --git a/Documentation/RelNotes-1.6.0.1.txt b/Documentation/RelNotes-1.6.0.1.txt
index bac117e89..49d7a1caf 100644
--- a/Documentation/RelNotes-1.6.0.1.txt
+++ b/Documentation/RelNotes-1.6.0.1.txt
@@ -4,6 +4,9 @@ GIT v1.6.0.1 Release Notes
 Fixes since v1.6.0
 ------------------
 
+* "git diff --cc" did not honor content mangling specified by
+  gitattributes and core.autocrlf when reading from the work tree.
+
 * "git diff --check" incorrectly detected new trailing blank lines when
   whitespace check was in effect.
 
@@ -13,6 +16,8 @@ Fixes since v1.6.0
 * "git format-patch" peeked before the beginning of a string when
   "format.headers" variable is empty (a misconfiguration).
 
+* "git help help" did not work correctly.
+
 * "git mailinfo" (hence "git am") was unhappy when MIME multipart message
   contained garbage after the finishing boundary.
 
@@ -22,10 +27,10 @@ Fixes since v1.6.0
 * "git merge" did not refresh the index correctly when a merge resulted in
   a fast-forward.
 
-Contains other various documentation fixes.
+* "git merge" did not resolve a truly trivial merges that can be done
+  without content level merges.
 
---
-exec >/var/tmp/1
-O=v1.6.0-14-g3a634dc
-echo O=$(git describe maint)
-git shortlog --no-merges $O..maint
+* "git svn dcommit" to a repository with URL that has embedded usernames
+  did not work correctly.
+
+Contains other various documentation fixes.