diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-28 17:42:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-28 17:42:26 -0700 |
| commit | 1ba5c532e1f6ede63fd46bf6b647e70baa10a364 (patch) | |
| tree | 5b514b2936389e2f0433565881c8555fe189c644 /Documentation | |
| parent | msvc: Select the "fast" definition of the {get,put}_be32() macros (diff) | |
| parent | Update draft release notes to 1.7.1.1 (diff) | |
| download | tgif-1ba5c532e1f6ede63fd46bf6b647e70baa10a364.tar.xz | |
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.1.1
notes: Initialise variable to appease gcc
notes: check number of parameters to "git notes copy"
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes-1.7.1.1.txt | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/Documentation/RelNotes-1.7.1.1.txt b/Documentation/RelNotes-1.7.1.1.txt index bfdb5ba064..1f94db8bdd 100644 --- a/Documentation/RelNotes-1.7.1.1.txt +++ b/Documentation/RelNotes-1.7.1.1.txt @@ -17,6 +17,13 @@ Fixes since v1.7.1 * We didn't recognize timezone "Z" as a synonym for "UTC" (75b37e70). + * In 1.7.0, read-tree and user commands that use the mechanism such as + checkout and merge were fixed to handle switching between branches one + of which has a file while the other has a directory at the same path + correctly even when there are some "confusing" pathnames in them. But + the algorithm used for this fix was suboptimal and had a terrible + performance degradation especially in larger trees. + * "git am -3" did not show diagnosis when the patch in the message was corrupt. * After "git apply --whitespace=fix" removed trailing blank lines in an @@ -57,10 +64,15 @@ Fixes since v1.7.1 * "git merge --log" used to replace the custom message given by "-m" with the shortlog, instead of appending to it. + * "git notes copy" without any other argument segfaulted. + * "git pull" accepted "--dry-run", gave it to underlying "git fetch" but ignored the option itself, resulting in a bogus attempt to merge unrelated commit. + * "git rebase" did not faithfully reproduce a malformed author ident, that + is often seen in a repository converted from foreign SCMs. + * "git reset --hard" started from a wrong directory and a working tree in a nonstandard location is in use got confused. @@ -68,6 +80,9 @@ Fixes since v1.7.1 EHLO/HELO exchange, causing rejected connection from picky servers. It learned --smtp-domain option to solve this issue. + * "git send-email" did not declare a content-transfer-encoding and + content-type even when its payload needs to be sent in 8-bit. + * "git show -C -C" and other corner cases lost diff metainfo output in 1.7.0. @@ -83,6 +98,6 @@ And other minor fixes and documentation updates. -- exec >/var/tmp/1 -O=v1.7.1-195-gb2ebbd8 +O=v1.7.1-211-g54fcb21 echo O=$(git describe HEAD) git shortlog --no-merges HEAD ^$O |