Git 1.7.11-rc1

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 04cf2647d5c3bf6f731837acf1a90f8305513304..f74adcc0be38a4cb5e77c52468218cea8756b458 100644 (file)
--- a/Documentation/RelNotes/1.7.11.txt
+++ b/Documentation/RelNotes/1.7.11.txt
@@ -126,15 +126,10 @@ 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).
 
- * 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 ebbe8734942b88f7fb76024a50245fa005ee1328..955b02b48032db91d80d8009da28e1d15099c56c 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-rc0
+DEF_VER=v1.7.11-rc1
 
 LF='
 '