The seventh batch

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

diff --git a/Documentation/RelNotes/2.46.0.txt b/Documentation/RelNotes/2.46.0.txt
index ff3ce813daff17ec2d6b5b255baf6385685c3884..e74720d057d1f044ca4c3f0328f0999bc3a97e62 100644 (file)
--- a/Documentation/RelNotes/2.46.0.txt
+++ b/Documentation/RelNotes/2.46.0.txt
@@ -40,6 +40,8 @@ UI, Workflows & Features
  * Updates to symbolic refs can now be made as a part of ref
    transaction.
 
+ * The trailer API has been reshuffled a bit.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -140,6 +142,11 @@ Fixes since v2.45
    the wrong order almost consistently, which has been corrected.
    (merge f01301aabe jc/compat-regex-calloc-fix later to maint).
 
+ * Expose "name conflict" error when a ref creation fails due to D/F
+   conflict in the ref namespace, to improve an error message given by
+   "git fetch".
+   (merge 9339fca23e it/refs-name-conflict later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 4cf6e7bf5e jt/doc-submitting-rerolled-series later to maint).
    (merge a5a4cb7b27 rs/diff-parseopts-cleanup later to maint).
@@ -148,3 +155,5 @@ Fixes since v2.45
    (merge 55702c543e fa/p4-error later to maint).
    (merge 2566a77774 vd/doc-merge-tree-x-option later to maint).
    (merge b64b0df9da ds/scalar-reconfigure-all-fix later to maint).
+   (merge c81ffcff83 dm/update-index-doc-fix later to maint).
+   (merge fc0202b0e9 dg/fetch-pack-code-cleanup later to maint).