diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-08-30 01:52:03 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-08-30 01:52:03 +0400 |
commit | f324cb50be3d88c6fb6123c85da749695a749f60 (patch) | |
tree | cbd14ca24f221951c52cc4949e3184d03d7ad91f | |
parent | f7aec129fa78e39e200352502377f57952516f98 (diff) | |
parent | 82c3e210002d452867a46a9d8806a8aee82ae9d0 (diff) |
Sync with 1.6.4.2
-rw-r--r-- | Documentation/RelNotes-1.6.4.2.txt | 32 | ||||
-rw-r--r-- | Documentation/git.txt | 3 | ||||
-rw-r--r-- | t/t8005/iso8859-5.txt | 2 |
3 files changed, 34 insertions, 3 deletions
diff --git a/Documentation/RelNotes-1.6.4.2.txt b/Documentation/RelNotes-1.6.4.2.txt new file mode 100644 index 0000000000..c11ec0115c --- /dev/null +++ b/Documentation/RelNotes-1.6.4.2.txt @@ -0,0 +1,32 @@ +GIT v1.6.4.2 Release Notes +========================== + +Fixes since v1.6.4.1 +-------------------- + +* --date=relative output between 1 and 5 years ago rounded the number of + years when saying X years Y months ago, instead of rounding it down. + +* "git add -p" did not handle changes in executable bits correctly + (a regression around 1.6.3). + +* "git apply" did not honor GNU diff's convention to mark the creation/deletion + event with UNIX epoch timestamp on missing side. + +* "git checkout" incorrectly removed files in a directory pointed by a + symbolic link during a branch switch that replaces a directory with + a symbolic link. + +* "git clean -d -f" happily descended into a subdirectory that is managed by a + separate git repository. It now requires two -f options for safety. + +* "git fetch/push" over http transports had two rather grave bugs. + +* "git format-patch --cover-letter" did not prepare the cover letter file + for use with non-ASCII strings when there are the series contributors with + non-ASCII names. + +* "git pull origin branch" and "git fetch origin && git merge origin/branch" + left different merge messages in the resulting commit. + +Other minor documentation updates are included. diff --git a/Documentation/git.txt b/Documentation/git.txt index a9bacfbef4..ad44cac71d 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.6.4.1/git.html[documentation for release 1.6.4.1] +* link:v1.6.4.2/git.html[documentation for release 1.6.4.2] * release notes for + link:RelNotes-1.6.4.2.txt[1.6.4.2], link:RelNotes-1.6.4.1.txt[1.6.4.1], link:RelNotes-1.6.4.txt[1.6.4]. diff --git a/t/t8005/iso8859-5.txt b/t/t8005/iso8859-5.txt deleted file mode 100644 index 2e4b80c8df..0000000000 --- a/t/t8005/iso8859-5.txt +++ /dev/null @@ -1,2 +0,0 @@ -ISO8859_5_NAME="Иван Петрович Сидоров" -ISO8859_5_MSG="Тестовое сообщение" |