Sixth batch for 2.7

diff --git a/Documentation/RelNotes/2.7.0.txt b/Documentation/RelNotes/2.7.0.txt
index a958f853e6462aded2e48ad9fcb8c5fd2f78f74a..85c35202d1af11e091cbc6bb553bad9ba9872283 100644 (file)
--- a/Documentation/RelNotes/2.7.0.txt
+++ b/Documentation/RelNotes/2.7.0.txt
@@ -31,7 +31,7 @@ UI, Workflows & Features
  * The use of 'good/bad' in "git bisect" made it confusing to use when
    hunting for a state change that is not a regression (e.g. bugfix).
    The command learned 'old/new' and then allows the end user to
-   say e.g. "bisect start --term-old=fast --term=new=slow" to find a
+   say e.g. "bisect start --term-old=fast --term-new=slow" to find a
    performance regression.
 
  * "git interpret-trailers" can now run outside of a Git repository.
@@ -74,6 +74,15 @@ Performance, Internal Implementation, Development Support etc.
    ref-filter API that is shared with "git tag" and "git
    for-each-ref".
 
+ * The test for various line-ending conversions has been enhanced.
+
+ * A few test scripts around "git p4" have been improved for
+   portability.
+
+ * Many allocations that is manually counted (correctly) that are
+   followed by strcpy/sprintf have been replaced with a less error
+   prone constructs such as xstrfmt.
+
 
 Also contains various documentation updates and code clean-ups.
 
@@ -200,12 +209,28 @@ notes for details).
    work trees created via "git worktree add".
    (merge 11f9dd7 mk/submodule-gitdir-path later to maint).
 
+ * "git gc" is safe to run anytime only because it has the built-in
+   grace period to protect young objects.  In order to run with no
+   grace period, the user must make sure that the repository is
+   quiescent.
+   (merge fae1a90 jc/doc-gc-prune-now later to maint).
+
+ * A recent "filter-branch --msg-filter" broke skipping of the commit
+   object header, which is fixed.
+   (merge a5a4b3f jk/filter-branch-use-of-sed-on-incomplete-line later to maint).
+
+ * The normalize_ceiling_entry() function does not muck with the end
+   of the path it accepts, and the real world callers do rely on that,
+   but a test insisted that the function drops a trailing slash.
+   (merge b2a7123 rd/test-path-utils later to maint).
+
  * Code clean-up and minor fixes.
    (merge 15ed07d jc/rerere later to maint).
-   (merge b744767 pt/pull-builtin later to maint).
+   (merge e7a7401 pt/pull-builtin later to maint).
    (merge 29bc480 nd/ls-remote-does-not-have-u-option later to maint).
    (merge be510e0 jk/asciidoctor-section-heading-markup-fix later to maint).
    (merge 83e6bda tk/typofix-connect-unknown-proto-error later to maint).
    (merge a43eb67 tk/doc-interpret-trailers-grammo later to maint).
    (merge ba128e2 es/worktree-add-cleanup later to maint).
    (merge 44cd91e cc/quote-comments later to maint).
+   (merge 147875f sb/submodule-config-parse later to maint).