The 14th batch

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

diff --git a/Documentation/RelNotes/2.54.0.adoc b/Documentation/RelNotes/2.54.0.adoc
index ed5231f82cee916c4956716e9db0d8e607917926..a8bc6f0d6f5412b609a82f91f00b3099fcbb42b5 100644 (file)
--- a/Documentation/RelNotes/2.54.0.adoc
+++ b/Documentation/RelNotes/2.54.0.adoc
@@ -64,6 +64,10 @@ UI, Workflows & Features
    submodule.<name>.ignore that is set to "all" (and requires "git add
    -f" to override it).
 
+ * Hook commands are now allowed to be defined (possibly centrally)
+   in the configuration files, and run multiple of them for the same
+   hook event.
+
 
 Performance, Internal Implementation, Development Support etc.
 --------------------------------------------------------------
@@ -152,6 +156,10 @@ Performance, Internal Implementation, Development Support etc.
 
  * Code refactoring around refs-for-each-* API functions.
 
+ * The parse-options API learned to notice an options[] array with
+   duplicated long options.
+   (merge 237e520d81 rs/parse-options-duplicated-long-options later to maint).
+
 
 Fixes since v2.53
 -----------------
@@ -247,6 +255,22 @@ Fixes since v2.53
    graph part of its own output correctly, which has been corrected.
    (merge 064b869efc lp/diff-stat-utf8-display-width-fix later to maint).
 
+ * The configuration variable format.noprefix did not behave as a
+   proper boolean variable, which has now been fixed and documented.
+   (merge ea3a62c40e kh/format-patch-noprefix-is-boolean later to maint).
+
+ * CI fix.
+   (merge eb35167dd4 ps/ci-reduce-gitlab-envsize later to maint).
+
+ * "git diff --no-index --find-object=<object-name>" outside a
+   repository of course wouldn't be able to find the object and died
+   while parsing the command line.  The command is made to die in a
+   bit more user-friendly way.
+   (merge b0ddc7947c mm/diff-no-index-find-object later to maint).
+
+ * Fix typo-induced breakages in fsmonitor-watchman sample hook.
+   (merge 41366e4677 pt/fsmonitor-watchman-sample-fix later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge d79fff4a11 jk/remote-tracking-ref-leakfix later to maint).
    (merge 7a747f972d dd/t5403-modernise later to maint).
@@ -278,3 +302,5 @@ Fixes since v2.53
    (merge 7451864bfa sc/pack-redundant-leakfix later to maint).
    (merge f87593ab1a cx/fetch-display-ubfix later to maint).
    (merge a66c8c7f91 jk/repo-structure-cleanup later to maint).
+   (merge 5ee8782f87 ss/test-that-that-typofix later to maint).
+   (merge f31b322008 fp/t3310-test-path-is-helpers later to maint).