The fourteenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 7, 2021 at 12:35 UTC
2d677e5b1537692a4f875740a6e9853c24285f02
1 file changed
+53
Documentation/RelNotes/2.32.0.txt
+53
@@ -7,6 +7,13 @@ Backward compatibility notes
7
* ".gitattributes", ".gitignore", and ".mailmap" files that are
8
symbolic links are ignored.
9
10
+ * "git apply --3way" used to first attempt a straight application,
11
+ and only fell back to the 3-way merge algorithm when the stright
12
+ application failed. Starting with this version, the command will
13
+ first try the 3-way merge algorithm and only when it fails (either
14
+ resulting with conflict or the base versions of blobs are missing),
15
+ falls back to the usual patch application.
16
+
17
18
Updates since v2.31
19
-------------------
@@ -80,6 +87,26 @@ UI, Workflows & Features
87
* "git log" learned "--diff-merges=<style>" option, with an
88
associated configuration variable log.diffMerges.
89
90
+ * "git log --format=..." placeholders learned %ah/%ch placeholders to
91
+ request the --date=human output.
92
+
93
+ * Replace GIT_CONFIG_NOSYSTEM mechanism to decline from reading the
94
+ system-wide configuration file with GIT_CONFIG_SYSTEM that lets
95
+ users specify from which file to read the system-wide configuration
96
+ (setting it to an empty file would essentially be the same as
97
+ setting NOSYSTEM), and introduce GIT_CONFIG_GLOBAL to override the
98
+ per-user configuration in $HOME/.gitconfig.
99
+
100
+ * "git add" and "git rm" learned not to touch those paths that are
101
+ outside of sparse checkout.
102
+
103
+ * "git rev-list" learns the "--filter=object:type=<type>" option,
104
+ which can be used to exclude objects of the given kind from the
105
+ packfile generated by pack-objects.
106
+
107
+ * The command line completion (in contrib/) for "git stash" has been
108
+ updated.
109
+
110
111
Performance, Internal Implementation, Development Support etc.
112
@@ -149,6 +176,11 @@ Performance, Internal Implementation, Development Support etc.
176
* Effort to make the command line completion (in contrib/) safe with
177
"set -u" continues.
178
179
+ * Tweak a few tests for "log --format=..." that show timestamps in
180
+ various formats.
181
+
182
+ * The reflog expiry machinery has been taught to emit trace events.
183
+
184
185
Fixes since v2.31
186
-----------------
@@ -262,6 +294,26 @@ Fixes since v2.31
294
not necessarily) encoded in UTF-8.
295
(merge 9364bf465d ab/pathname-encoding-doc later to maint).
296
297
+ * "git --config-env var=val cmd" weren't accepted (only
298
+ --config-env=var=val was).
299
+ (merge c331551ccf ps/config-env-option-with-separate-value later to maint).
300
+
301
+ * When the reachability bitmap is in effect, the "do not lose
302
+ recently created objects and those that are reachable from them"
303
+ safety to protect us from races were disabled by mistake, which has
304
+ been corrected.
305
+ (merge 2ba582ba4c jk/prune-with-bitmap-fix later to maint).
306
+
307
+ * Cygwin pathname handling fix.
308
+ (merge bccc37fdc7 ad/cygwin-no-backslashes-in-paths later to maint).
309
+
310
+ * "git rebase --[no-]reschedule-failed-exec" did not work well with
311
+ its configuration variable, which has been corrected.
312
+ (merge e5b32bffd1 ab/rebase-no-reschedule-failed-exec later to maint).
313
+
314
+ * Portability fix for command line completion script (in contrib/).
315
+ (merge f2acf763e2 si/zsh-complete-comment-fix later to maint).
316
+
317
* Other code cleanup, docfix, build fix, etc.
318
(merge f451960708 dl/cat-file-doc-cleanup later to maint).
319
(merge 12604a8d0c sv/t9801-test-path-is-file-cleanup later to maint).
@@ -280,3 +332,4 @@ Fixes since v2.31
332
(merge 81ed96a9b2 jt/fetch-pack-request-fix later to maint).
333
(merge 151b6c2dd7 jc/doc-do-not-capitalize-clarification later to maint).
334
(merge 9160068ac6 js/access-nul-emulation-on-windows later to maint).
335
+ (merge 7a14acdbe6 po/diff-patch-doc later to maint).