X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2FRelNotes-1.6.0.1.txt;h=49d7a1cafabd129e392b48b85a9641b7f5ddb828;hb=db12d97542762cdb54d332ea047122f1071132b5;hp=3ee85a7993bad93f8db56e0146a1c95f5989ddb3;hpb=614eef259f0e805c7f656e1684b6a7ae56e1ee40;p=git.git diff --git a/Documentation/RelNotes-1.6.0.1.txt b/Documentation/RelNotes-1.6.0.1.txt index 3ee85a799..49d7a1caf 100644 --- a/Documentation/RelNotes-1.6.0.1.txt +++ b/Documentation/RelNotes-1.6.0.1.txt @@ -4,12 +4,33 @@ 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. -Contains other various documentation fixes. +* "git diff --check" incorrectly detected new trailing blank lines when + whitespace check was in effect. + +* "git for-each-ref" tried to dereference NULL when asked for '%(body)" on + a tag with a single incomplete line as its payload. + +* "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. --- -exec >/var/tmp/1 -O=v1.6.0 -echo O=$(git describe maint) -git shortlog --no-merges $O..maint +* "git mailinfo" also was unhappy when the "From: " line only had a bare + e-mail address. + +* "git merge" did not refresh the index correctly when a merge resulted in + a fast-forward. + +* "git merge" did not resolve a truly trivial merges that can be done + without content level merges. + +* "git svn dcommit" to a repository with URL that has embedded usernames + did not work correctly. + +Contains other various documentation fixes.