diff options
| -rw-r--r-- | Documentation/RelNotes/1.7.10.4.txt | 4 | ||||
| -rw-r--r-- | Documentation/RelNotes/1.7.11.txt | 7 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/RelNotes/1.7.10.4.txt b/Documentation/RelNotes/1.7.10.4.txt index 154bba46eb..326670df6e 100644 --- a/Documentation/RelNotes/1.7.10.4.txt +++ b/Documentation/RelNotes/1.7.10.4.txt @@ -22,4 +22,8 @@ Fixes since v1.7.10.3 read from a file, did not treat individual lines in the given pattern argument as separate regular expressions as it should. + * When "git rebase" was given a bad commit to replay the history on, + its error message did not correctly give the command line argument + it had trouble parsing. + Also contains minor fixes and documentation updates. 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/Documentation/git.txt b/Documentation/git.txt index f86ce05d16..55e405d644 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,10 @@ 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.10.3/git.html[documentation for release 1.7.10.3] +* link:v1.7.10.4/git.html[documentation for release 1.7.10.4] * release notes for + link:RelNotes/1.7.10.4.txt[1.7.10.4], link:RelNotes/1.7.10.3.txt[1.7.10.3], link:RelNotes/1.7.10.2.txt[1.7.10.2], link:RelNotes/1.7.10.1.txt[1.7.10.1], 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=' ' |