From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Jun 2016 22:30:19 +0000 (-0700)
Subject: Hopefully the final last-minute update before 2.9 final
X-Git-Tag: v2.9.0~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a28705da929ad746abcb34270947f738549d3246?ds=sidebyside;hp=-c

Hopefully the final last-minute update before 2.9 final

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

a28705da929ad746abcb34270947f738549d3246
diff --git a/Documentation/RelNotes/2.9.0.txt b/Documentation/RelNotes/2.9.0.txt
index 927cb9bfc7..b61d36712f 100644
--- a/Documentation/RelNotes/2.9.0.txt
+++ b/Documentation/RelNotes/2.9.0.txt
@@ -118,9 +118,11 @@ UI, Workflows & Features
  * HTTP transport clients learned to throw extra HTTP headers at the
    server, specified via http.extraHeader configuration variable.
 
- * Patch output from "git diff" and friends has been tweaked to be
-   more readable by using a blank line as a strong hint that the
-   contents before and after it belong to logically separate units.
+ * The "--compaction-heuristic" option to "git diff" family of
+   commands enables a heuristic to make the patch output more readable
+   by using a blank line as a strong hint that the contents before and
+   after it belong to logically separate units.  It is still
+   experimental.
 
  * A new configuration variable core.hooksPath allows customizing
    where the hook directory is.
@@ -506,3 +508,5 @@ notes for details).
    (merge cd82b7a pa/cherry-pick-doc-typo later to maint).
    (merge 2bb73ae rs/patch-id-use-skip-prefix later to maint).
    (merge aa20cbc rs/apply-name-terminate later to maint).
+   (merge fe17fc0 jc/t2300-setup later to maint).
+   (merge e256eec jk/shell-portability later to maint).