diff --git a/Documentation/RelNotes/1.7.11.txt b/Documentation/RelNotes/1.7.11.txt
index 04cf264..f74adcc 100644
--- a/Documentation/RelNotes/1.7.11.txt
+++ b/Documentation/RelNotes/1.7.11.txt
@@ -126,15 +126,10 @@
 releases are contained in this release (see release notes to them for
 details).
 
- * When "git rebase" is fed a bad revision name (either as base, or
-   with the --onto option), it did not correctly give the command line
-   parameter it had trouble with in its error message.
-   (merge 9180fea ef/maint-rebase-error-message 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.
-   (merge 8a6dae1 vr/rebase-autosquash-does-not-imply-i later to maint).
+   (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.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index ebbe873..955b02b 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.11-rc0
+DEF_VER=v1.7.11-rc1
 
 LF='
 '