The fourteenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 3, 2024 at 10:55 UTC
7774cfed6261ce2900c84e55906da708c711d601
1 file changed
+27
Documentation/RelNotes/2.45.0.txt
+27
@@ -60,6 +60,12 @@ UI, Workflows & Features
60
* Hints that suggest what to do after resolving conflicts can now be
61
squelched by disabling advice.mergeConflict.
62
63
+ * Allow git-cherry-pick(1) to automatically drop redundant commits via
64
+ a new `--empty` option, similar to the `--empty` options for
65
+ git-rebase(1) and git-am(1). Includes a soft deprecation of
66
+ `--keep-redundant-commits` as well as some related docs changes and
67
+ sequencer code cleanup.
68
+
69
70
Performance, Internal Implementation, Development Support etc.
71
@@ -118,6 +124,15 @@ Performance, Internal Implementation, Development Support etc.
124
outside them, and document the best practice to help future
125
developers.
126
127
+ * Introduce an experimental protocol for contributors to propose the
128
+ topic description to be used in the "What's cooking" report, the
129
+ merge commit message for the topic, and in the release notes and
130
+ document it in the SubmittingPatches document.
131
+
132
+ * The t/README file now gives a hint on running individual tests in
133
+ the "t/" directory with "make t<num>-*.sh t<num>-*.sh".
134
+ (merge 8d383806fc pb/test-scripts-are-build-targets later to maint).
135
+
136
137
Fixes since v2.44
138
-----------------
@@ -270,6 +285,16 @@ Fixes since v2.44
285
files left, which has been corrected.
286
(merge 0068aa7946 ps/reftable-unit-test-nfs-workaround later to maint).
287
288
+ * The implementation and documentation of "object-format" option
289
+ exchange between the Git itself and its remote helpers did not
290
+ quite match, which has been corrected.
291
+
292
+ * The "--pretty=<shortHand>" option of the commands in the "git log"
293
+ family, defined as "[pretty] shortHand = <expansion>" should have
294
+ been looked up case insensitively, but was not, which has been
295
+ corrected.
296
+ (merge f999d5188b bl/pretty-shorthand-config-fix later to maint).
297
+
298
* Other code cleanup, docfix, build fix, etc.
299
(merge f0e578c69c rs/use-xstrncmpz later to maint).
300
(merge 83e6eb7d7a ba/credential-test-clean-fix later to maint).
@@ -292,3 +317,5 @@ Fixes since v2.44
317
(merge ad538c61da jc/index-pack-fsck-levels later to maint).
318
(merge 67471bc704 ja/doc-formatting-fix later to maint).
319
(merge 86f9ce7dd6 bl/doc-config-fixes later to maint).
320
+ (merge 0d527842b7 az/grep-group-error-message-update later to maint).
321
+ (merge 7c43bdf07b rs/strbuf-expand-bad-format later to maint).