The fifth batch

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

1 files changed, 17 insertions, 12 deletions

diff --git a/Documentation/RelNotes/2.32.0.txt b/Documentation/RelNotes/2.32.0.txt
index 6f69a521ac..f39eede001 100644
--- a/Documentation/RelNotes/2.32.0.txt
+++ b/Documentation/RelNotes/2.32.0.txt
@@ -40,6 +40,13 @@ UI, Workflows & Features
    tweak both the message and the contents, and only the message,
    respectively.
 
+ * When accessing a server with a URL like https://user:pass@site/, we
+   did not to fall back to the basic authentication with the
+   credential material embedded in the URL after the "Negotiate"
+   authentication failed.  Now we do.
+
+ * "git send-email" learned to honor the core.hooksPath configuration.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -66,29 +73,22 @@ Fixes since v2.31
  * The fsmonitor interface read from its input without making sure
    there is something to read from.  This bug is new in 2.31
    timeframe.
-   (merge 097ea2c848 jh/fsmonitor-prework later to maint).
 
  * The data structure used by fsmonitor interface was not properly
    duplicated during an in-core merge, leading to use-after-free etc.
-   (merge 4abc57848d js/fsmonitor-unpack-fix later to maint).
 
  * "git bisect" reimplemented more in C during 2.30 timeframe did not
    take an annotated tag as a good/bad endpoint well.  This regression
    has been corrected.
-   (merge 7730f85594 jk/bisect-peel-tag-fix later to maint).
 
  * Fix macros that can silently inject unintended null-statements.
-   (merge 116affac3f rs/avoid-null-statement-after-macro-call later to maint).
 
  * CALLOC_ARRAY() macro replaces many uses of xcalloc().
-   (merge 1c57cc70ec rs/calloc-array later to maint).
 
  * Update insn in Makefile comments to run fuzz-all target.
-   (merge 68b5c3aa48 ah/make-fuzz-all-doc-update later to maint).
 
  * Fix a corner case bug in "git mv" on case insensitive systems,
    which was introduced in 2.29 timeframe.
-   (merge 93c3d297b5 tb/git-mv-icase-fix later to maint).
 
  * We had a code to diagnose and die cleanly when a required
    clean/smudge filter is missing, but an assert before that
@@ -115,15 +115,20 @@ Fixes since v2.31
    which has been corrected.
    (merge 75555676ad bc/clone-bare-with-conflicting-config later to maint).
 
+ * When "git checkout" removes a path that does not exist in the
+   commit it is checking out, it wasn't careful enough not to follow
+   symbolic links, which has been corrected.
+   (merge fab78a0c3d mt/checkout-remove-nofollow later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
-   (merge 486f4bd183 jc/calloc-fix later to maint).
-   (merge 5f70859c15 jt/clone-unborn-head later to maint).
-   (merge cfd409ed09 km/config-doc-typofix later to maint).
-   (merge 8588aa8657 jk/slimmed-down later to maint).
-   (merge 241b5d3ebe rs/xcalloc-takes-nelem-first later to maint).
    (merge f451960708 dl/cat-file-doc-cleanup later to maint).
    (merge 12604a8d0c sv/t9801-test-path-is-file-cleanup later to maint).
    (merge ea7e63921c jr/doc-ignore-typofix later to maint).
    (merge 23c781f173 ps/update-ref-trans-hook-doc later to maint).
    (merge 42efa1231a jk/filter-branch-sha256 later to maint).
    (merge 4c8e3dca6e tb/push-simple-uses-branch-merge-config later to maint).
+   (merge 6534d436a2 bs/asciidoctor-installation-hints later to maint).
+   (merge 47957485b3 ab/read-tree later to maint).
+   (merge 2be927f3d1 ab/diff-no-index-tests later to maint).
+   (merge 76593c09bb ab/detox-gettext-tests later to maint).
+   (merge 28e29ee38b jc/doc-format-patch-clarify later to maint).