From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Feb 2024 00:04:14 +0000 (-0800)
Subject: The second batch
X-Git-Tag: v2.45.0-rc0~159
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f9d4d28b7e6021b7e6db192b7bf47bd3a0d0d1d;p=thirdparty%2Fgit.git

The second batch

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

diff --git a/Documentation/RelNotes/2.45.0.txt b/Documentation/RelNotes/2.45.0.txt
index 4f5a01c611..e75e5ca362 100644
--- a/Documentation/RelNotes/2.45.0.txt
+++ b/Documentation/RelNotes/2.45.0.txt
@@ -12,6 +12,9 @@ UI, Workflows & Features
  * "git checkout -p" and friends learned that that "@" is a synonym
    for "HEAD".
 
+ * Variants of vimdiff learned to honor mergetool.<variant>.layout
+   settings.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -21,6 +24,9 @@ Performance, Internal Implementation, Development Support etc.
  * More tests that are marked as "ref-files only" have been updated to
    improve test coverage of reftable backend.
 
+ * Some parts of command line completion script (in contrib/) have
+   been micro-optimized.
+
 
 Fixes since v2.44
 -----------------
@@ -36,5 +42,20 @@ Fixes since v2.44
    it would lead to nonsense behaviour including division by zero.
    (merge 76fb807faa kh/column-reject-negative-padding later to maint).
 
+ * "git am --help" now tells readers what actions are available in
+   "git am --whitespace=<action>", in addition to saying that the
+   option is passed through to the underlying "git apply".
+   (merge a171dac734 jc/am-whitespace-doc later to maint).
+
+ * "git tag --column" failed to check the exit status of its "git
+   column" invocation, which has been corrected.
+   (merge 92e66478fc rj/tag-column-fix later to maint).
+
+ * Credential helper based on libsecret (in contrib/) has been updated
+   to handle an empty password correctly.
+   (merge 8f1f2023b7 mh/libsecret-empty-password-fix later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge f0e578c69c rs/use-xstrncmpz later to maint).
+   (merge 83e6eb7d7a ba/credential-test-clean-fix later to maint).
+   (merge 64562d784d jb/doc-interactive-singlekey-do-not-need-perl later to maint).