From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 May 2021 03:35:33 +0000 (+0900)
Subject: The fourteenth batch
X-Git-Tag: v2.32.0-rc0~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d677e5b1537692a4f875740a6e9853c24285f02;p=thirdparty%2Fgit.git

The fourteenth batch

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

diff --git a/Documentation/RelNotes/2.32.0.txt b/Documentation/RelNotes/2.32.0.txt
index f4e5191ae2..fa79067ec2 100644
--- a/Documentation/RelNotes/2.32.0.txt
+++ b/Documentation/RelNotes/2.32.0.txt
@@ -7,6 +7,13 @@ Backward compatibility notes
  * ".gitattributes", ".gitignore", and ".mailmap" files that are
    symbolic links are ignored.
 
+ * "git apply --3way" used to first attempt a straight application,
+   and only fell back to the 3-way merge algorithm when the stright
+   application failed.  Starting with this version, the command will
+   first try the 3-way merge algorithm and only when it fails (either
+   resulting with conflict or the base versions of blobs are missing),
+   falls back to the usual patch application.
+
 
 Updates since v2.31
 -------------------
@@ -80,6 +87,26 @@ UI, Workflows & Features
  * "git log" learned "--diff-merges=<style>" option, with an
    associated configuration variable log.diffMerges.
 
+ * "git log --format=..." placeholders learned %ah/%ch placeholders to
+   request the --date=human output.
+
+ * Replace GIT_CONFIG_NOSYSTEM mechanism to decline from reading the
+   system-wide configuration file with GIT_CONFIG_SYSTEM that lets
+   users specify from which file to read the system-wide configuration
+   (setting it to an empty file would essentially be the same as
+   setting NOSYSTEM), and introduce GIT_CONFIG_GLOBAL to override the
+   per-user configuration in $HOME/.gitconfig.
+
+ * "git add" and "git rm" learned not to touch those paths that are
+   outside of sparse checkout.
+
+ * "git rev-list" learns the "--filter=object:type=<type>" option,
+   which can be used to exclude objects of the given kind from the
+   packfile generated by pack-objects.
+
+ * The command line completion (in contrib/) for "git stash" has been
+   updated.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -149,6 +176,11 @@ Performance, Internal Implementation, Development Support etc.
  * Effort to make the command line completion (in contrib/) safe with
    "set -u" continues.
 
+ * Tweak a few tests for "log --format=..." that show timestamps in
+   various formats.
+
+ * The reflog expiry machinery has been taught to emit trace events.
+
 
 Fixes since v2.31
 -----------------
@@ -262,6 +294,26 @@ Fixes since v2.31
    not necessarily) encoded in UTF-8.
    (merge 9364bf465d ab/pathname-encoding-doc later to maint).
 
+ * "git --config-env var=val cmd" weren't accepted (only
+   --config-env=var=val was).
+   (merge c331551ccf ps/config-env-option-with-separate-value later to maint).
+
+ * When the reachability bitmap is in effect, the "do not lose
+   recently created objects and those that are reachable from them"
+   safety to protect us from races were disabled by mistake, which has
+   been corrected.
+   (merge 2ba582ba4c jk/prune-with-bitmap-fix later to maint).
+
+ * Cygwin pathname handling fix.
+   (merge bccc37fdc7 ad/cygwin-no-backslashes-in-paths later to maint).
+
+ * "git rebase --[no-]reschedule-failed-exec" did not work well with
+   its configuration variable, which has been corrected.
+   (merge e5b32bffd1 ab/rebase-no-reschedule-failed-exec later to maint).
+
+ * Portability fix for command line completion script (in contrib/).
+   (merge f2acf763e2 si/zsh-complete-comment-fix later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge f451960708 dl/cat-file-doc-cleanup later to maint).
    (merge 12604a8d0c sv/t9801-test-path-is-file-cleanup later to maint).
@@ -280,3 +332,4 @@ Fixes since v2.31
    (merge 81ed96a9b2 jt/fetch-pack-request-fix later to maint).
    (merge 151b6c2dd7 jc/doc-do-not-capitalize-clarification later to maint).
    (merge 9160068ac6 js/access-nul-emulation-on-windows later to maint).
+   (merge 7a14acdbe6 po/diff-patch-doc later to maint).