Merge branch 'sb/plug-wt-shortstatus-tracking-leak'

diff --git a/Documentation/RelNotes/2.4.0.txt b/Documentation/RelNotes/2.4.0.txt
index 386c75d0b30dcdf25fc9375602cf85cee7022c27..21df61c3be002f668c3617835cba0fb6ef974938 100644 (file)
--- a/Documentation/RelNotes/2.4.0.txt
+++ b/Documentation/RelNotes/2.4.0.txt
@@ -5,7 +5,8 @@ Backward compatibility warning(s)
 ---------------------------------
 
 This release has a few changes in the user-visible output from
-Porcelain commands, which the users may want to be aware of.
+Porcelain commands. These are not meant to be parsed by scripts, but
+the users still may want to be aware of the changes:
 
  * Output from "git log --decorate" (and "%d" format specifier used in
    the userformat "--format=<string>" parameter "git log" family of
@@ -186,6 +187,11 @@ Performance, Internal Implementation, Development Support etc.
    finish) and also add code to prevent such abuse in the run-command
    helper.
 
+ * People often forget to chain the commands in their test together
+   with &&, leaving a failure from an earlier command in the test go
+   unnoticed.  The new GIT_TEST_CHAIN_LINT mechanism allows you to
+   catch such a mistake more easily.
+
 
 Also contains various documentation updates and code clean-ups.
 
@@ -211,7 +217,7 @@ notes for details).
    (merge 339de50 dk/format-patch-ignore-diff-submodule later to maint).
 
  * After attempting and failing a password-less authentication
-   (e.g. kerberos), libcURL refuses to fall back to password based
+   (e.g. Kerberos), libcURL refuses to fall back to password based
    Basic authentication without a bit of help/encouragement.
    (merge 4dbe664 bc/http-fallback-to-password-after-krb-fails later to maint).
 
@@ -296,7 +302,7 @@ notes for details).
    (merge 35840a3 jc/conf-var-doc later to maint).
 
  * An earlier workaround to squelch unhelpful deprecation warnings
-   from the complier on Mac OSX unnecessarily set minimum required
+   from the compiler on Mac OSX unnecessarily set minimum required
    version of the OS, which the user might want to raise (or lower)
    for other reasons.
    (merge 88c03eb es/squelch-openssl-warnings-on-macosx later to maint).
@@ -464,3 +470,7 @@ notes for details).
    (merge 7032054 nd/doc-git-index-version later to maint).
    (merge e869c5e tg/test-index-v4 later to maint).
    (merge 599d223 jk/simplify-csum-file-sha1fd-check later to maint).
+   (merge 260d585 sg/completion-gitcomp-nl-for-refs later to maint).
+   (merge 777c55a jc/report-path-error-to-dir later to maint).
+   (merge fddfaf8 ph/push-doc-cas later to maint).
+   (merge 129260c ss/pull-rebase-preserve later to maint).