Skip to content

Commit 090d24e

Browse files
committed
Clean up RelNotes for 2.48
There somehow ended up too many bogus "merge X later to maint" comments for topics that cannot be merged ever down to 'maint' because they were forked from more recent integration branches in the draft release notes. Remove them, as they are inviting for mistakes later. Signed-off-by: Junio C Hamano <[email protected]>
1 parent 25b0f41 commit 090d24e

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

Documentation/RelNotes/2.48.0.txt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,21 +109,17 @@ Fixes since v2.47
109109
(merge 0c1a9987da db/submodule-fetch-with-remote-name-fix later to maint).
110110

111111
* Fixes compile time warnings with 64-bit MSVC.
112-
(merge 386d372031 sk/msvc-warnings later to maint).
113112

114113
* Teaches 'shortlog' to explicitly use SHA-1 when operating outside
115114
of a repository.
116-
(merge b33001645e wm/shortlog-hash later to maint).
117115

118116
* Fix 'git grep' regression on macOS by disabling lookahead when
119117
encountering invalid UTF-8 byte sequences.
120-
(merge ce025ae4f6 rs/grep-lookahead later to maint).
121118

122119
* The dumb-http code regressed when the result of re-indexing a pack
123120
yielded an *.idx file that differs in content from the *.idx file
124121
it downloaded from the remote. This has been corrected by no longer
125122
relying on: the *.idx file we got from the remote.
126-
(merge 863f2459a2 jk/dumb-http-finalize later to maint).
127123

128124
* When called with '--left-right' and '--use-bitmap-index', 'rev-list'
129125
will produce output without any left/right markers, which has been
@@ -145,7 +141,6 @@ Fixes since v2.47
145141
opened at the destination path.
146142

147143
* Other code cleanup, docfix, build fix, etc.
148-
(merge 66893a14d0 ps/leakfixes-part-8 later to maint).
149144
(merge 1164e270b5 jk/output-prefix-cleanup later to maint).
150145
(merge f36b8cbaef jh/config-unset-doc-fix later to maint).
151146
(merge 4154ed4108 js/doc-platform-support-link-fix later to maint).
@@ -157,14 +152,4 @@ Fixes since v2.47
157152
(merge 6dab49b9fb tc/bundle-uri-leakfix later to maint).
158153
(merge f1ed39987b xx/protocol-v2-doc-markup-fix later to maint).
159154
(merge 41869f7447 ak/typofixes later to maint).
160-
(merge f1eea0b620 ak/typofix later to maint).
161155
(merge dcd590a39d bf/t-readme-mention-reftable later to maint).
162-
(merge 52acf6771b kh/submitting-patches later to maint).
163-
(merge a73070fbd4 ks/t4205-fixup later to maint).
164-
(merge 9e362dd060 co/t6050-pipefix later to maint).
165-
(merge 91687cd13f sk/t7011-cleanup later to maint).
166-
(merge 19c291e5b2 ua/t3404-cleanup later to maint).
167-
(merge c32d4a8cfe ss/duplicate-typos later to maint).
168-
(merge 09bf122507 sk/t9101-cleanup later to maint).
169-
(merge c348191afe ak/t1016-cleanup later to maint).
170-
(merge f56f9d6c0b ak/more-typofixes later to maint).

0 commit comments

Comments
 (0)