diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-15 16:16:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-15 16:16:56 -0700 |
| commit | f574cb3404a87d99604c9fc77efb95fe362f0b72 (patch) | |
| tree | 50c7c0e3a4e2b15d398892819aea970b840e7835 /Documentation/RelNotes | |
| parent | 2f80de956f71880b000933b1b9bff4991c5b3ca9 (diff) | |
| parent | 96dbe93da541cb930bacd4e2df0a95e41d4c6441 (diff) | |
| download | git-f574cb3404a87d99604c9fc77efb95fe362f0b72.tar.gz git-f574cb3404a87d99604c9fc77efb95fe362f0b72.tar.xz | |
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.5.2
git_open_noatime(): drop unused parameter
sha1_file: typofix
Diffstat (limited to 'Documentation/RelNotes')
| -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 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 <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. |