summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes-1.7.1.txt9
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt
index 95c5ed6016..10389adb4a 100644
--- 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/.
+ * 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.
@@ -66,6 +68,8 @@ Updates since v1.7.0
* "gitweb" installation procedure can use "minified" js/css files
better.
+ * Various documentation updates.
+
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 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.
@@ -84,5 +91,5 @@ release, unless otherwise noted.
---
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..
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index e5b1111a37..1063945c30 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.1.rc1.GIT
+DEF_VER=v1.7.1.rc2
LF='
'