The third batch

Signed-off-by: Taylor Blau <me@ttaylorr.com>

diff --git a/Documentation/RelNotes/2.48.0.txt b/Documentation/RelNotes/2.48.0.txt
index 0fecb8de2700bf2ca2f68a1c4c86b489c8bb41b9..988237ac716f5bff9fe034438c4e522403e21d90 100644 (file)
--- a/Documentation/RelNotes/2.48.0.txt
+++ b/Documentation/RelNotes/2.48.0.txt
@@ -25,6 +25,10 @@ Performance, Internal Implementation, Development Support etc.
    allocation function given to it may fail to allocate and to deal
    with such an error.
 
+ * An extra worktree attached to a repository points at each other to
+   allow finding the repository from the worktree and vice versa
+   possible.  Turn this linkage to relative paths.
+
 
 Fixes since v2.47
 -----------------
@@ -46,6 +50,10 @@ Fixes since v2.47
    reference, which has been corrected.
    (merge c95547a394 ps/maintenance-start-crash-fix later to maint).
 
+ * Fail gracefully instead of crashing when attempting to write the
+   contents of a corrupt in-core index as a tree object.
+   (merge ecb5c4318c ps/cache-tree-w-broken-index-entry later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 66893a14d0 ps/leakfixes-part-8 later to maint).
    (merge 1164e270b5 jk/output-prefix-cleanup later to maint).