summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-29 21:31:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-29 21:31:01 (GMT)
commit82c3e210002d452867a46a9d8806a8aee82ae9d0 (patch)
tree9f73eb3c1faa3187fd19838f940338112a76cdcf
parente71c008dce548ba882a604b255dd7945b3a61b21 (diff)
downloadgit-1.6.4.2.zip
git-1.6.4.2.tar.gz
git-1.6.4.2.tar.bz2
GIT 1.6.4.2v1.6.4.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes-1.6.4.2.txt32
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
4 files changed, 36 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 0000000..c11ec01
--- /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 a9bacfb..ad44cac 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/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 55fc07f..76c6dd2 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.6.4.1
+DEF_VER=v1.6.4.2
LF='
'
diff --git a/RelNotes b/RelNotes
index ed4498a..0bcee07 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.6.4.1.txt \ No newline at end of file
+Documentation/RelNotes-1.6.4.2.txt \ No newline at end of file