summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-03 15:56:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-03 15:56:05 -0700
commit3fe4498197ced84886b4adaddf18f1109b477f8e (patch)
tree6db4a67ae32f0fc40a8e23f4d8ac46426775a9cf /Documentation
parentSync with 1.7.10.4 (diff)
downloadtgif-3fe4498197ced84886b4adaddf18f1109b477f8e.tar.xz
Git 1.7.11-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/1.7.11.txt7
1 files changed, 1 insertions, 6 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.