Merge branch 'nd/maint-setup'

diff --git a/Documentation/RelNotes/1.7.5.txt b/Documentation/RelNotes/1.7.5.txt
index b1b25133eb48cda8546eb4bd17d43af6a5fcec93..987919c32143f86d7e7b193b002e7d2ea2df8917 100644 (file)
--- a/Documentation/RelNotes/1.7.5.txt
+++ b/Documentation/RelNotes/1.7.5.txt
@@ -1,4 +1,4 @@
-Git v1.7.5 Release Notes (draft)
+Git v1.7.5 Release Notes
 ========================
 
 Updates since v1.7.4
@@ -8,7 +8,7 @@ Updates since v1.7.4
 
  * Various git-p4 enhancements (in contrib).
 
- * Various vcs-svn enhancements.
+ * Various vcs-svn, git-svn and gitk enhancements and fixes.
 
  * Various git-gui updates (0.14.0).
 
@@ -130,9 +130,3 @@ release, unless otherwise noted.
    doing both a mirror fetch and a mirror push at the same time, which
    made little sense.  We now warn and require the command line to specify
    either --mirror=fetch or --mirror=push.
-
----
-exec >/var/tmp/1
-O=v1.7.5-rc1
-echo O=$(git describe 'master')
-git shortlog --no-merges ^maint ^$O master