summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-10 22:30:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-10 22:30:19 (GMT)
commita28705da929ad746abcb34270947f738549d3246 (patch)
tree637e3dc1bd412daaede26e6215f33d008fda01e9
parente5f767554404592cf65e7c49b3594b195a324031 (diff)
downloadgit-a28705da929ad746abcb34270947f738549d3246.zip
git-a28705da929ad746abcb34270947f738549d3246.tar.gz
git-a28705da929ad746abcb34270947f738549d3246.tar.bz2
Hopefully the final last-minute update before 2.9 final
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.9.0.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/RelNotes/2.9.0.txt b/Documentation/RelNotes/2.9.0.txt
index 927cb9b..b61d367 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).