Git 1.7.12-rc2

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

diff --git a/Documentation/RelNotes/1.7.12.txt b/Documentation/RelNotes/1.7.12.txt
index a557241aeb3d5acb2a862423c383847f80130190..fb7f761a38fbe55422084ee41362d0830f1f3a6b 100644 (file)
--- a/Documentation/RelNotes/1.7.12.txt
+++ b/Documentation/RelNotes/1.7.12.txt
@@ -51,10 +51,6 @@ UI, Workflows & Features
    read. The error message in this case was updated to give better
    hints to the user.
 
    read. The error message in this case was updated to give better
    hints to the user.
 

- * git native protocol agents learned to show software version over
-   the wire, so that the server log can be examined to see the vintage
-   distribution of clients.
-

  * "git help -w $cmd" can show HTML version of documentation for
    "git-$cmd" by setting help.htmlpath to somewhere other than the
    default location where the build procedure installs them locally;
  * "git help -w $cmd" can show HTML version of documentation for
    "git-$cmd" by setting help.htmlpath to somewhere other than the
    default location where the build procedure installs them locally;

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4c1a79e3b26d332651dc0c22a4442e2962f3059a..54c1fc86e008ba347489f24a7d091c12be05a4e1 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.12-rc1
+DEF_VER=v1.7.12-rc2

 
 LF='
 '
 
 LF='
 '