From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Aug 2015 19:27:39 +0000 (-0700)
Subject: Seventh batch for 2.6
X-Git-Tag: v2.6.0-rc0~27
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e6837c8b439ae95654c6e831d42620d2510a8008?ds=inline;hp=--cc

Seventh batch for 2.6

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

e6837c8b439ae95654c6e831d42620d2510a8008
diff --git a/Documentation/RelNotes/2.6.0.txt b/Documentation/RelNotes/2.6.0.txt
index 075d9feeab..050371d94c 100644
--- a/Documentation/RelNotes/2.6.0.txt
+++ b/Documentation/RelNotes/2.6.0.txt
@@ -255,6 +255,14 @@ notes for details).
    in Bourne shell.
    (merge 82aec45 sg/help-group later to maint).
 
+ * The experimental untracked-cache feature were buggy when paths with
+   a few levels of subdirectories are involved.
+   (merge 73f9145 dt/untracked-subdir later to maint).
+
+ * "interpret-trailers" helper mistook a single-liner log message that
+   has a colon as the end of existing trailer.
+   (merge 6262fe9 cc/trailers-corner-case-fix later to maint).
+
  * Code cleanups and documentation updates.
    (merge 1c601af es/doc-clean-outdated-tools later to maint).
    (merge 3581304 kn/tag-doc-fix later to maint).