Git 1.7.1-rc2

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

diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt
index 95c5ed6016d9bfe0c2efd3e399e6270a0984149b..10389adb4aa289b5fdfb37c56b32efd213e5bd1d 100644 (file)
--- a/Documentation/RelNotes-1.7.1.txt
+++ b/Documentation/RelNotes-1.7.1.txt
@@ -6,6 +6,8 @@ Updates since v1.7.0
 
  * Eric Raymond is the maintainer of updated CIAbot scripts, in contrib/.
 
 
  * Eric Raymond is the maintainer of updated CIAbot scripts, in contrib/.
 

+ * gitk updates.
+

  * Some commands (e.g. svn and http interfaces) that interactively ask
    for a password can be told to use an external program given via
    GIT_ASKPASS.
  * Some commands (e.g. svn and http interfaces) that interactively ask
    for a password can be told to use an external program given via
    GIT_ASKPASS.


@@ -66,6 +68,8 @@ Updates since v1.7.0
  * "gitweb" installation procedure can use "minified" js/css files
    better.
 
  * "gitweb" installation procedure can use "minified" js/css files
    better.
 

+ * Various documentation updates.
+

 Fixes since v1.7.0
 ------------------
 
 Fixes since v1.7.0
 ------------------
 


@@ -75,6 +79,9 @@ release, unless otherwise noted.
  * "git add frotz/nitfol" did not complain when the entire frotz/ directory
    was ignored.
 
  * "git add frotz/nitfol" did not complain when the entire frotz/ directory
    was ignored.
 

+ * "git diff --stat" used "int" to count the size of differences,
+   which could result in overflowing.
+

  * "git rev-list --pretty=oneline" didn't terminate a record with LF for
    commits without any message.
 
  * "git rev-list --pretty=oneline" didn't terminate a record with LF for
    commits without any message.
 


@@ -84,5 +91,5 @@ release, unless otherwise noted.
 ---
 exec >/var/tmp/1
 echo O=$(git describe)
 ---
 exec >/var/tmp/1
 echo O=$(git describe)

-O=v1.7.1-rc0-36-gb92cbb6
+O=v1.7.1-rc1-49-g407a963

 git shortlog --no-merges ^maint $O..
 git shortlog --no-merges ^maint $O..

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index e5b1111a37fdd25da1b3bb3c0076313c4daeacff..1063945c303f8e4dec8dcc11e340b8d89f86065b 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.1.rc1.GIT
+DEF_VER=v1.7.1.rc2

 
 LF='
 '
 
 LF='
 '