diff options
| -rw-r--r-- | Documentation/RelNotes/1.7.11.txt | 7 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Documentation/RelNotes/1.7.11.txt b/Documentation/RelNotes/1.7.11.txt index 04cf2647d5..f74adcc0be 100644 --- 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 ebbe873494..955b02b480 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=' ' |