Git 1.7.10.2

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

diff --git a/Documentation/RelNotes/1.7.10.2.txt b/Documentation/RelNotes/1.7.10.2.txt
index 55e960a54b3e8e90e36509b1e8b82269124850bd..7a7e9d6fd128bc14fd73353203b6b7c0540fe5ec 100644 (file)
--- a/Documentation/RelNotes/1.7.10.2.txt
+++ b/Documentation/RelNotes/1.7.10.2.txt
@@ -14,6 +14,9 @@ Fixes since v1.7.10.1
  * HTTP transport that requires authentication did not work correctly when
    multiple connections are used simultaneously.
 
  * HTTP transport that requires authentication did not work correctly when
    multiple connections are used simultaneously.
 

+ * Minor memory leak during unpack_trees (hence "merge" and "checkout"
+   to check out another branch) has been plugged.
+

  * In the older days, the header "Conflicts:" in "cherry-pick" and "merge"
    was separated by a blank line from the list of paths that follow for
    readability, but when "merge" was rewritten in C, we lost it by
  * In the older days, the header "Conflicts:" in "cherry-pick" and "merge"
    was separated by a blank line from the list of paths that follow for
    readability, but when "merge" was rewritten in C, we lost it by


@@ -52,13 +55,24 @@ Fixes since v1.7.10.1
  * "git push" over smart-http lost progress output a few releases ago;
    this release resurrects it.
 
  * "git push" over smart-http lost progress output a few releases ago;
    this release resurrects it.
 

+ * The error and advice messages given by "git push" when it fails due
+   to non-ff were not very helpful to new users; it has been broken
+   into three cases, and each is given a separate advice message.
+

  * The insn sheet given by "rebase -i" did not make it clear that the
    insn lines can be re-ordered to affect the order of the commits in
    the resulting history.
 
  * The insn sheet given by "rebase -i" did not make it clear that the
    insn lines can be re-ordered to affect the order of the commits in
    the resulting history.
 

+ * "git repack" used to write out unreachable objects as loose objects
+   when repacking, even if such loose objects will immediately pruned
+   due to its age.
+

  * A contrib script "rerere-train" did not work out of the box unless
    user futzed with her $PATH.
 
  * A contrib script "rerere-train" did not work out of the box unless
    user futzed with her $PATH.
 

+ * "git rev-parse --show-prefix" used to emit nothing when run at the
+   top-level of the working tree, but now it gives a blank line.
+

  * The i18n of error message "git stash save" was not properly done.
 
  * "git submodule" used a sed script that some platforms mishandled.
  * The i18n of error message "git stash save" was not properly done.
 
  * "git submodule" used a sed script that some platforms mishandled.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 85277759881a316d362a8d527a26c0895c692bbd..c54321312633030879ecf003ee0cc17fe95c0137 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,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.7.10.1/git.html[documentation for release 1.7.10.1]
+* link:v1.7.10.2/git.html[documentation for release 1.7.10.2]

 
 * release notes for
 
 * release notes for

+  link:RelNotes/1.7.10.2.txt[1.7.10.2],

   link:RelNotes/1.7.10.1.txt[1.7.10.1],
   link:RelNotes/1.7.10.txt[1.7.10].
 
   link:RelNotes/1.7.10.1.txt[1.7.10.1],
   link:RelNotes/1.7.10.txt[1.7.10].
 

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 692222afb3f634879408c8d470cdd854b5a3752c..1df7b0ff662ba83fdf2d1a9e6ed2084f4995912f 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.7.10.1
+DEF_VER=v1.7.10.2

 
 LF='
 '
 
 LF='
 '