From: Junio C Hamano Date: Sun, 15 May 2011 23:11:55 +0000 (-0700) Subject: Update draft release notes to 1.7.5.2 X-Git-Tag: v1.7.5.2~13 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=96dbe93da541cb930bacd4e2df0a95e41d4c6441;p=git.git Update draft release notes to 1.7.5.2 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/RelNotes/1.7.5.2.txt b/Documentation/RelNotes/1.7.5.2.txt index 2e7b15721..b985b07da 100644 --- a/Documentation/RelNotes/1.7.5.2.txt +++ b/Documentation/RelNotes/1.7.5.2.txt @@ -21,9 +21,18 @@ Fixes since v1.7.5.1 * "git diff -M --cached" used to use unmerged path as a possible rename source candidate, which made no sense. + * "git format-patch" did not quote RFC822 special characters in the + email address (e.g From: Junio C. Hamano , not + From: "Junio C. Hamano" ). + + * "git format-patch" when run with "--quiet" option used to produce a + nonsense result that consists of alternating empty output. + * "git merge-one-file" did not honor GIT_WORK_TREE settings when handling a "both sides added, differently" conflict. + * "git mergetool" did not handle conflicted submoudules gracefully. + * "git-p4" (in contrib) used a wrong base image while merge a file that was added on both branches differently.