diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-16 01:11:55 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-16 01:11:55 +0200 |
| commit | 96dbe93da541cb930bacd4e2df0a95e41d4c6441 (patch) | |
| tree | f258b8817e3dcfc2c162e0975132d14d62befacf /Documentation/RelNotes/1.7.5.2.txt | |
| parent | Merge branch 'cn/format-patch-quiet' into maint (diff) | |
| download | git-96dbe93da541cb930bacd4e2df0a95e41d4c6441.tar.xz git-96dbe93da541cb930bacd4e2df0a95e41d4c6441.zip | |
Update draft release notes to 1.7.5.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | Documentation/RelNotes/1.7.5.2.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/RelNotes/1.7.5.2.txt b/Documentation/RelNotes/1.7.5.2.txt index 2e7b157210..b985b07da5 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 <jch@example.com>, not + From: "Junio C. Hamano" <jch@example.com>). + + * "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. |