summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-22 06:03:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-22 06:03:46 (GMT)
commit805c5a578995db7594ad0751a683bc6422655c29 (patch)
treebcd85fec449cc0f6b4c5c61931aedd07f18d4a43 /Documentation
parente3d44930318ed3746fe6da51913602d4fad8daaf (diff)
parent31fe4057b17847a15d1fbe9f1a5521c942fa8ade (diff)
downloadgit-805c5a578995db7594ad0751a683bc6422655c29.zip
git-805c5a578995db7594ad0751a683bc6422655c29.tar.gz
git-805c5a578995db7594ad0751a683bc6422655c29.tar.bz2
Sync with maint
* maint: Update draft release notes to 1.8.3.4 t9801: git-p4: check ignore files with client spec
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/1.8.3.4.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/RelNotes/1.8.3.4.txt b/Documentation/RelNotes/1.8.3.4.txt
index 24ee2b8..56f106e 100644
--- a/Documentation/RelNotes/1.8.3.4.txt
+++ b/Documentation/RelNotes/1.8.3.4.txt
@@ -13,3 +13,8 @@ Fixes since v1.8.3.3
* The test coverage framework was left broken for some time.
* The test suite for HTTP transport did not run with Apache 2.4.
+
+ * "git diff" used to fail when core.safecrlf is set and the working
+ tree contents had mixed CRLF/LF line endings. Committing such a
+ content must be prohibited, but "git diff" should help the user to
+ locate and fix such problems without failing.