Merge branch 'jk/fast-import-history-bugfix'

diff --git a/Documentation/RelNotes/1.7.11.txt b/Documentation/RelNotes/1.7.11.txt
index a1f7994cec3ffa97cc81bf88236ce7d0f9621349..15b954ca4b01ae0dbf0b42adcd66d6f69a5f2d59 100644 (file)
--- a/Documentation/RelNotes/1.7.11.txt
+++ b/Documentation/RelNotes/1.7.11.txt
@@ -54,7 +54,8 @@ UI, Workflows & Features
    instance of the external tool once per a file pair.
 
  * The "fmt-merge-msg" command learned to list the primary contributors
-   involved in the side topic you are merging.
+   involved in the side topic you are merging in a comment in the merge
+   commit template.
 
  * "git rebase" learned to optionally keep commits that do not
    introduce any change in the original history.
@@ -129,11 +130,6 @@ 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).
 
- * "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.
-   (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.
    (cherry-pick c1c259e jl/submodule-report-new-path-once later to maint).