Sync with 1.6.6.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

3 files changed, 45 insertions, 8 deletions

diff --git a/Documentation/RelNotes-1.6.5.8.txt b/Documentation/RelNotes-1.6.5.8.txt
new file mode 100644
index 0000000000..8b24bebb96
--- /dev/null
+++ b/Documentation/RelNotes-1.6.5.8.txt
@@ -0,0 +1,28 @@
+Git v1.6.5.8 Release Notes
+==========================
+
+Fixes since v1.6.5.7
+--------------------
+
+* "git count-objects" did not handle packfiles that are bigger than 4G on
+  platforms with 32-bit off_t.
+
+* "git rebase -i" did not abort cleanly if it failed to launch the editor.
+
+* "git blame" did not work well when commit lacked the author name.
+
+* "git fast-import" choked when handling a tag that points at an object
+  that is not a commit.
+
+* "git reset --hard" did not work correctly when GIT_WORK_TREE environment
+  variable is used to point at the root of the true work tree.
+
+* "git grep" fed a buffer that is not NUL-terminated to underlying
+  regexec().
+
+* "git checkout -m other" while on a branch that does not have any commit
+  segfaulted, instead of failing.
+
+* "git branch -a other" should have diagnosed the command as an error.
+
+Other minor documentation updates are also included.
diff --git a/Documentation/RelNotes-1.6.6.1.txt b/Documentation/RelNotes-1.6.6.1.txt
index 406fbc4e0f..f1d0a4ae2d 100644
--- a/Documentation/RelNotes-1.6.6.1.txt
+++ b/Documentation/RelNotes-1.6.6.1.txt
@@ -4,8 +4,16 @@ Git v1.6.6.1 Release Notes
 Fixes since v1.6.6
 ------------------
 
+ * "git blame" did not work well when commit lacked the author name.
+
  * "git branch -a name" wasn't diagnosed as an error.
 
+ * "git count-objects" did not handle packfiles that are bigger than 4G on
+   platforms with 32-bit off_t.
+
+ * "git checkout -m other" while on a branch that does not have any commit
+   segfaulted, instead of failing.
+
  * "git fast-import" choked when fed a tag that do not point at a
    commit.
 
@@ -15,6 +23,11 @@ Fixes since v1.6.6
  * "git grep -L" didn't show empty files (they should never match, and
    they should always appear in -L output as unmatching).
 
+ * "git rebase -i" did not abort cleanly if it failed to launch the editor.
+
+ * "git reset --hard" did not work correctly when GIT_WORK_TREE environment
+   variable is used to point at the root of the true work tree.
+
  * http-backend was not listed in the command list in the documentation.
 
  * Building on FreeBSD (both 7 and 8) needs OLD_ICONV set in the Makefile
@@ -22,9 +35,3 @@ Fixes since v1.6.6
  * "git checkout -m some-branch" while on an unborn branch crashed.
 
 Other minor documentation updates are included.
-
---
-exec >/var/tmp/1
-O=v1.6.6-39-g6304c40
-echo O=$(git describe maint)
-git shortlog --no-merges $O..maint
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 352c23019f..b6df39ba36 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,14 +43,16 @@ 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.6/git.html[documentation for release 1.6.6]
+* link:v1.6.6.1/git.html[documentation for release 1.6.6.1]
 
 * release notes for
+  link:RelNotes-1.6.6.1.txt[1.6.6.1],
   link:RelNotes-1.6.6.txt[1.6.6].
 
-* link:v1.6.5.7/git.html[documentation for release 1.6.5.7]
+* link:v1.6.5.8/git.html[documentation for release 1.6.5.8]
 
 * release notes for
+  link:RelNotes-1.6.5.8.txt[1.6.5.8],
   link:RelNotes-1.6.5.7.txt[1.6.5.7],
   link:RelNotes-1.6.5.6.txt[1.6.5.6],
   link:RelNotes-1.6.5.5.txt[1.6.5.5],