The sixth batch

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

diff --git a/Documentation/RelNotes/2.42.0.txt b/Documentation/RelNotes/2.42.0.txt
index 85e078839c0dfb7d85a0da15db52183ddd09622e..310f8993062901ba9b45c8a67c9462254eafed7c 100644 (file)
--- a/Documentation/RelNotes/2.42.0.txt
+++ b/Documentation/RelNotes/2.42.0.txt
@@ -31,6 +31,10 @@ Performance, Internal Implementation, Development Support etc.
 
  * "git worktree" learned to work better with sparse index feature.
 
+ * When the external merge driver is killed by a signal, its output
+   should not be trusted as a resolution with conflicts that is
+   proposed by the driver, but the code did.
+
 
 Fixes since v2.41
 -----------------
@@ -117,6 +121,11 @@ Fixes since v2.41
    between the way the code enumerates packfiles in the repository.
    (merge 73320e49ad tb/collect-pack-filenames-fix later to maint).
 
+ * We create .pack and then .idx, we consider only packfiles that have
+   .idx usable (those with only .pack are not ready yet), so we should
+   remove .idx before removing .pack for consistency.
+   (merge 0dd1324a73 ds/remove-idx-before-pack later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 51f9d2e563 sa/doc-ls-remote later to maint).
    (merge c6d26a9dda jk/format-patch-message-id-unleak later to maint).