Git 1.7.11

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

diff --git a/Documentation/RelNotes/1.7.11.txt b/Documentation/RelNotes/1.7.11.txt
index a9fa44919fa9c6fd997c56f6f33114d1fa18e895..15b954ca4b01ae0dbf0b42adcd66d6f69a5f2d59 100644 (file)
--- a/Documentation/RelNotes/1.7.11.txt
+++ b/Documentation/RelNotes/1.7.11.txt
@@ -130,15 +130,6 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance
 releases are contained in this release (see release notes to them for
 details).
 
- * "git fast-export" did not give a readable error message when the
-   same mark erroneously appeared twice in the --import-marks input.
-   (merge 43bc230 js/maint-fast-export-mark-error later to maint).
-
- * "git rebase -p" used to pay attention to rebase.autosquash which
-    was wrong.  "git rebase -p -i" should, but "git rebase -p" by
-    itself should not.
-   (cherry-pick 8a6dae1 vr/rebase-autosquash-does-not-imply-i later to maint).
-
  * "git submodule init" used to report "registered for path ..."
    even for submodules that were registered earlier.
    (cherry-pick c1c259e jl/submodule-report-new-path-once later to maint).

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 682fec5677a6670fce503d6e563f2b77507a4bd9..59ce6ac241833efd09571ffe957e23a0e7784396 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,6 +44,11 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
+* link:v1.7.11/git.html[documentation for release 1.7.11]
+
+* release notes for
+  link:RelNotes/1.7.11.txt[1.7.11].
+
 * link:v1.7.10.5/git.html[documentation for release 1.7.10.5]
 
 * release notes for

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 728a5d4d290d9c503bf0db72bbc40656ec815a2b..43d564920d3f64b68f47fb231032e104dad2da41 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.11-rc3
+DEF_VER=v1.7.11
 
 LF='
 '