Merge branch 'tc/merge-m-log'

diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt
index 58cf113a90b0ebcebb0199a1ce1780d3a17f8a22..9d89fedb36b4d6fa7c8a6a8487cc47b4ca542e3a 100644 (file)
--- a/Documentation/RelNotes-1.7.1.txt
+++ b/Documentation/RelNotes-1.7.1.txt
@@ -1,11 +1,13 @@
-Git v1.7.1 Release Notes (draft)
-================================
+Git v1.7.1 Release Notes
+========================
 
 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.
@@ -63,6 +65,11 @@ Updates since v1.7.0
 
  * "git imap-send" learned to support CRAM-MD5 authentication.
 
+ * "gitweb" installation procedure can use "minified" js/css files
+   better.
+
+ * Various documentation updates.
+
 Fixes since v1.7.0
 ------------------
 
@@ -72,14 +79,11 @@ 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.
 
  * "git rev-list --abbrev-commit" defaulted to 40-byte abbreviations, unlike
    newer tools in the git toolset.
-
----
-exec >/var/tmp/1
-echo O=$(git describe)
-O=v1.7.0.4-382-gb807c52
-git shortlog --no-merges ^maint $O..