GIT 1.5.6.2

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

diff --git a/Documentation/RelNotes-1.5.6.2.txt b/Documentation/RelNotes-1.5.6.2.txt
index 02d5910d5c89436b3de29fec5df633dd93a6eb4a..5902a85a78610ec38f4cf160ccd3c01267b4f9a1 100644 (file)
--- a/Documentation/RelNotes-1.5.6.2.txt
+++ b/Documentation/RelNotes-1.5.6.2.txt
@@ -11,21 +11,30 @@ Futureproof
 Fixes since v1.5.6.1
 --------------------
 
 Fixes since v1.5.6.1
 --------------------
 

-* Optimization for a large import via "git-svn" introduced in v1.5.6 had a
-  serious memory and temporary file leak, which made it unusable for
-  moderately large import.
+* "git clone" from a remote that is named with url.insteadOf setting in
+  $HOME/.gitconfig did not work well.

 
 

-* "git-svn" mangled remote nickname used in the configuration file
-  unnecessarily.
+* "git describe --long --tags" segfaulted when the described revision was
+  tagged with a lightweight tag.

 
 * "git diff --check" did not report the result via its exit status
   reliably.
 
 
 * "git diff --check" did not report the result via its exit status
   reliably.
 

+* When remote side used to have branch 'foo' and git-fetch finds that now
+  it has branch 'foo/bar', it refuses to lose the existing remote tracking
+  branch and its reflog.  The error message has been improved to suggest
+  pruning the remote if the user wants to proceed and get the latest set
+  of branches from the remote, including such 'foo/bar'.
+
+* "git reset file" should mean the same thing as "git reset HEAD file",
+  but we required disambiguating -- even when "file" is not ambiguous.
+

 * "git show" segfaulted when an annotated tag that points at another
   annotated tag was given to it.
 
 * "git show" segfaulted when an annotated tag that points at another
   annotated tag was given to it.
 

---
-exec >/var/tmp/1
-echo O=$(git describe maint)
-O=v1.5.6.1-13-g4f3dcc2
-git shortlog --no-merges $O..maint
+* Optimization for a large import via "git-svn" introduced in v1.5.6 had a
+  serious memory and temporary file leak, which made it unusable for
+  moderately large import.
+
+* "git-svn" mangled remote nickname used in the configuration file
+  unnecessarily.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 85468a154df10c97433c3ba625d94cb85ac40060..0d6fe9cf79a5d6c65d3c94cb237cf85ccade2aef 100644 (file)
--- 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:
 
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 

-* link:v1.5.6.1/git.html[documentation for release 1.5.6.1]
+* link:v1.5.6.2/git.html[documentation for release 1.5.6.2]

 
 * release notes for
 
 * release notes for

+  link:RelNotes-1.5.6.2.txt[1.5.6.2].

   link:RelNotes-1.5.6.1.txt[1.5.6.1].
   link:RelNotes-1.5.6.txt[1.5.6].
 
   link:RelNotes-1.5.6.1.txt[1.5.6.1].
   link:RelNotes-1.5.6.txt[1.5.6].