Skip to content

Commit 94b60ad

Browse files
committed
The 19th batch
Merge the topics that have been cooking since 2024-09-13 or so in 'next'. Let's try a new workflow to update the maintenance track by removing the "merge ... later to maint" comments from the draft release notes on the 'master' track. Signed-off-by: Junio C Hamano <[email protected]>
1 parent 83c1cc9 commit 94b60ad

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

Documentation/RelNotes/2.47.0.txt

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,17 +240,33 @@ Fixes since v2.46
240240
* In a few corner cases "git diff --exit-code" failed to report
241241
"changes" (e.g., renamed without any content change), which has
242242
been corrected.
243-
(merge 11591850dd rs/diff-exit-code-fix later to maint).
244243

245244
* Cygwin does have /dev/tty support that is needed by things like
246245
single-key input mode.
247-
(merge 39ba986b0e rj/cygwin-has-dev-tty later to maint).
248246

249247
* The interpret-trailers command failed to recognise the end of the
250248
message when the commit log ends in an incomplete line.
251-
(merge c02414a997 bl/trailers-and-incomplete-last-line-fix later to maint).
249+
250+
* "git rebase --autostash" failed to resurrect the autostashed
251+
changes when the command gets aborted after giving back control
252+
asking for hlep in conflict resolution.
253+
(merge bf6ab087d1 pw/rebase-autostash-fix later to maint).
254+
255+
* The "imap-send" now allows to be compiled with NO_OPENSSL and
256+
OPENSSL_SHA1 defined together.
257+
(merge 997950a750 jk/no-openssl-with-openssl-sha1 later to maint).
258+
259+
* The support to customize build options to adjust for older versions
260+
and/or older systems for the interop tests has been improved.
261+
(merge 22ef5f02a8 jk/interop-test-build-options later to maint).
262+
263+
* Update the character width table for Unicode 16.
264+
(merge 44dc651132 bb/unicode-width-table-16 later to maint).
265+
266+
* In Git 2.39, Git.pm stopped working in a bare repository, which has
267+
been corrected.
268+
(merge d3edb0bdde jk/git-pm-bare-repo-fix later to maint).
252269

253270
* Other code cleanup, docfix, build fix, etc.
254271
(merge be10ac7037 jc/mailinfo-header-cleanup later to maint).
255-
(merge 9a36ea37ae jc/doc-skip-fetch-all-and-prefetch later to maint).
256272
(merge 4460e052e0 jc/range-diff-lazy-setup later to maint).

0 commit comments

Comments
 (0)