What's cooking (2025/05 #02)
Junio C Hamano committed
May 5, 2025 at 15:17 UTC
d5faba5994a85bcc7419d126afdd14b0646e8d64
1 file changed
+152
-199
whats-cooking.txt
+152
-199
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2025, #01; Fri, 2)
3
-X-master-at: 6c0bd1fc70efaf053abe4e57c976afdc72d15377
4
-X-next-at: a8402760328a6f9879ce40263fe306538782a5b0
2
+Subject: What's cooking in git.git (May 2025, #02; Mon, 5)
3
+X-master-at: 6f84262c44a89851c3ae5a6e4c1a9d06b2068d75
4
+X-next-at: 170613ef418a11cdc11d88353825adf513fdfdf5
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (May 2025, #01; Fri, 2)
7
+What's cooking in git.git (May 2025, #02; Mon, 5)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,121 +48,145 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* as/typofix-in-env-h-header (2025-04-18) 1 commit
52
- (merged to 'next' on 2025-04-23 at a9954f6cec)
53
- + environment: fix typo: 'setup_git_directory_gently'
51
+* cf/wrapper-netbsd-errno-eftype (2025-05-02) 1 commit
52
+ - wrapper: NetBSD gives EFTYPE where POSIX uses ELOOP
53
55
- Typofix.
56
- source: <20250418185855.52950-1-abhijeet.nkt@gmaiil.com>
54
+ source: <20250502233403.289761-1-collin.funk1@gmail.com>
55
56
59
-* az/tighten-string-array-constness (2025-04-21) 1 commit
60
- (merged to 'next' on 2025-04-23 at 5a2b439731)
61
- + global: mark usage strings and string tables const
57
+* es/meson-cleanup (2025-04-25) 6 commits
58
+ (merged to 'next' on 2025-04-28 at 0cc8ee98dc)
59
+ + meson: only check for missing networking syms on non-Windows; add compat impls
60
+ + meson: fix typo in function check that prevented checking for hstrerror
61
+ + meson: add a couple missing networking dependencies
62
+ + meson: do a full usage-based compile check for sysinfo
63
+ + meson: check for getpagesize before using it
64
+ + meson: simplify and parameterize various standard function checks
65
63
- Code clean-up.
64
- source: <daj53eijkqzsjy5cvuxchea4qm3pbiu673ehetihfffyvwzhgs@tarta.nabijaczleweli.xyz>
66
+ Code clean-up for meson-based build infrastructure.
67
+
68
+ source: <20250425053345.17288-1-eschwartz@gentoo.org>
69
70
67
-* jh/gc-launchctl-schedule-fix (2025-04-23) 1 commit
68
- (merged to 'next' on 2025-04-23 at ab4f2e0c26)
69
- + maintenance: fix launchctl calendar intervals
71
+* js/ci-win-meson-timeout-workaround (2025-04-25) 1 commit
72
+ - ci(win+Meson): build in Release mode, avoiding t7001-mv hangs
73
71
- Fix for scheduled maintenance tasks on platforms using launchctl.
72
- source: <20250421054633.231069-2-joshiheinrichs@gmail.com>
74
+ win+Meson CI pipeline, unlike other pipelines for Windows,
75
+ used to build artifacts in develper mode, which has been changed to
76
+ build them in release mode for consistency.
77
78
+ Expecting a reroll, stating an updated rationale for the change.
79
+ cf. <xmqqjz6zuf80.fsf@gitster.g>
80
+ source: <pull.1908.git.1745593515875.gitgitgadget@gmail.com>
81
75
-* jk/p5332-testfix (2025-04-22) 1 commit
76
- (merged to 'next' on 2025-04-24 at eafff4d7b7)
77
- + p5332: drop "+" from --stdin-packs input
82
79
- A test fix.
80
- source: <20250422111632.GA1855088@coredump.intra.peff.net>
83
+* js/windows-arm64 (2025-04-23) 6 commits
84
+ (merged to 'next' on 2025-04-28 at c3d4cea333)
85
+ + max_tree_depth: lower it for clangarm64 on Windows
86
+ + mingw(arm64): do move the `/etc/git*` location
87
+ + msvc: do handle builds on Windows/ARM64
88
+ + mingw: do not use nedmalloc on Windows/ARM64
89
+ + config.mak.uname: add support for clangarm64
90
+ + bswap.h: add support for built-in bswap functions
91
92
+ Update to arm64 Windows port.
93
+
94
+ source: <pull.1904.v2.git.1745395308.gitgitgadget@gmail.com>
95
83
-* js/git-perf-env-override (2025-04-20) 1 commit
84
- (merged to 'next' on 2025-04-22 at 77ea361791)
85
- + perf: do allow `GIT_PERF_*` to be overridden again
96
87
- Developer support fix..
88
- source: <pull.1900.git.1743764167548.gitgitgadget@gmail.com>
97
+* kn/meson-hdr-check (2025-04-23) 7 commits
98
+ (merged to 'next' on 2025-04-29 at c925448238)
99
+ + makefile/meson: add 'check-headers' as alias for 'hdr-check'
100
+ + meson: add support for 'hdr-check'
101
+ + meson: rename 'third_party_sources' to 'third_party_excludes'
102
+ + meson: move headers definition from 'contrib/coccinelle'
103
+ + coccinelle: meson: rename variables to be more specific
104
+ + ci/github: install git before checking out the repository
105
+ + Merge branch 'es/meson-build-skip-coccinelle' into kn/meson-hdr-check
106
107
+ Add an equivalent to "make hdr-check" target to meson based builds.
108
+
109
+ source: <20250423-505-wire-up-sparse-via-meson-v5-0-d1e2be4b2078@gmail.com>
110
91
-* lo/remove-log-reencode-from-rev-info (2025-04-22) 1 commit
92
- (merged to 'next' on 2025-04-24 at 1c6c33ab1f)
93
- + revision: remove log_reencode field from rev_info
111
95
- Code clean-up.
96
- source: <20250422213133.18685-1-lucasseikioshiro@gmail.com>
112
+* ps/meson-build-perf-bench (2025-04-28) 5 commits
113
+ (merged to 'next' on 2025-04-28 at f563542bfd)
114
+ + meson: wire up benchmarking options
115
+ + meson: wire up benchmarks
116
+ + t/perf: fix benchmarks with out-of-tree builds
117
+ + t/perf: use configured PERL_PATH
118
+ + t/perf: fix benchmarks with alternate repo formats
119
+
120
+ The build procedure based on Meson learned to drive the
121
+ benchmarking tests.
122
+
123
+ source: <20250428-pks-meson-benchmarks-v5-0-5010dd014d1d@pks.im>
124
+
125
+--------------------------------------------------
126
+[New Topics]
127
128
+* cf/wrapper-bsd-eloop (2025-05-02) 1 commit
129
+ - wrapper: NetBSD gives EFTYPE where POSIX uses ELOOP
130
99
-* ps/ci-resurrect-p4-on-github (2025-04-22) 1 commit
100
- (merged to 'next' on 2025-04-24 at 8594d07a3e)
101
- + ci: fix p4d executable not being found on GitHub Actions
131
+ The fallback implementation of open_nofollow() depended on
132
+ open("symlink", O_NOFOLLOW) to set errno to ELOOP, but a few BSD
133
+ derived systems use different errno, which has been worked around.
134
103
- CI fix.
104
- source: <aActb3dB-r3s69h6@pks.im>
135
+ source: <20250502233403.289761-1-collin.funk1@gmail.com>
136
137
107
-* ps/fewer-perl (2025-04-16) 5 commits
108
- (merged to 'next' on 2025-04-23 at 275d267126)
109
- + Documentation: stop depending on Perl to generate command list
110
- + Documentation: stop depending on Perl to massage user manual
111
- + request-pull: stop depending on Perl
112
- + filter-branch: stop depending on Perl
113
- + Merge branch 'ps/test-wo-perl-prereq' into ps/fewer-perl
138
+* js/ci-build-win-in-release-mode (2025-05-05) 1 commit
139
+ - ci(win+Meson): build in Release mode
140
115
- Reduce requirement for Perl in our documentation build and a few
116
- scripts.
117
- source: <20250416-b4-pks-drop-perl-v2-0-bdd0492e9498@pks.im>
141
+ win+Meson CI pipeline, unlike other pipelines for Windows,
142
+ used to build artifacts in develper mode, which has been changed to
143
+ build them in release mode for consistency.
144
145
+ WIll merge to 'next'.
146
+ source: <pull.1908.v2.git.1746282346370.gitgitgadget@gmail.com>
147
120
-* ps/install-bash-completion (2025-04-22) 1 commit
121
- (merged to 'next' on 2025-04-24 at 1171444ac4)
122
- + contrib/completion: install Bash completion
148
124
- Build update to install bash (but not zsh) completion script.
125
- source: <20250422-b4-pks-meson-install-completions-v2-1-ab29d399bc6c@pks.im>
149
+* js/ci-buildsystems-cleanup (2025-05-05) 3 commits
150
+ - config.mak.uname: drop the `vcxproj` target
151
+ - contrib/buildsystems: drop support for building . vcproj/.vcxproj files
152
+ - ci: stop linking the `prove` cache
153
154
+ Code clean-up around stale CI elements and building with Visual Studio.
155
128
-* ps/reftable-api-revamp (2025-04-07) 17 commits
129
- (merged to 'next' on 2025-04-23 at 1a5f00290a)
130
- + reftable/table: move printing logic into test helper
131
- + reftable/constants: make block types part of the public interface
132
- + reftable/table: introduce iterator for table blocks
133
- + reftable/table: add `reftable_table` to the public interface
134
- + reftable/block: expose a generic iterator over reftable records
135
- + reftable/block: make block iterators reseekable
136
- + reftable/block: store block pointer in the block iterator
137
- + reftable/block: create public interface for reading blocks
138
- + git-zlib: use `struct z_stream_s` instead of typedef
139
- + reftable/block: rename `block_reader` to `reftable_block`
140
- + reftable/block: rename `block` to `block_data`
141
- + reftable/table: move reading block into block reader
142
- + reftable/block: simplify how we track restart points
143
- + reftable/blocksource: consolidate code into a single file
144
- + reftable/reader: rename data structure to "table"
145
- + reftable: fix formatting of the license header
146
- + Merge branch 'ps/reftable-sans-compat-util' into ps/reftable-api-revamp
156
+ Will merge to 'next'.
157
+ source: <pull.1916.git.1746430790.gitgitgadget@gmail.com>
158
+
159
+
160
+* kh/docfixes (2025-05-05) 2 commits
161
+ - doc: branch: fix inline-verbatim
162
+ - doc: reflog: fix `drop` subheading
163
148
- Overhaul of the reftable API.
149
- cf. <3okrcl7bdpy75hzyzpmrp7fluan4n3zvsroioq64id4a2kt3o4@fc6fetilb6y2>
150
- source: <20250407-pks-reftable-polishing-v2-0-316c4ff10571@pks.im>
164
+ Docfixes.
165
+
166
+ Will merge to 'next'.
167
+ source: <cover.1746299135.git.code@khaugsbakk.name>
168
169
153
-* ua/call-repo-config-with-possibly-null-repository (2025-04-20) 2 commits
154
- (merged to 'next' on 2025-04-22 at 1f30a19c02)
155
- + builtin/difftool: remove unnecessary if statement
156
- + builtin/add: remove unnecessary if statement
170
+* kj/glob-path-with-special-char (2025-05-05) 1 commit
171
+ - dir.c: literal match with wildcard in pathspec should still glob
172
158
- Since a call to repo_config() can be called with repo set to NULL
159
- these days, a command that is marked as RUN_SETUP in the builtin
160
- command table does not have to check repo with NULL before making
161
- the call.
162
- source: <20250420025501.183290-1-usmanakinyemi202@gmail.com>
173
+ "git add 'f?o'" did not add 'foo' if 'f?o', an unusual pathname,
174
+ also existed on the working tree, which has been corrected.
175
+
176
+ Will merge to 'next'.
177
+ source: <20250503060736.587286-1-jayatheerthkulkarni2005@gmail.com>
178
+
179
+
180
+* ps/ci-test-aggreg-fix-for-meson (2025-05-05) 1 commit
181
+ - ci: fix aggregation of test results with Meson
182
+
183
+ Test result aggregation did not work in Meson based CI jobs.
184
+
185
+ Will merge to 'next'.
186
+ source: <20250505-b4-pks-meson-aggregate-results-v1-1-f38899a0a2cc@pks.im>
187
188
--------------------------------------------------
165
-[New Topics]
189
+[Cooking]
190
191
* cc/promisor-remote-capability (2025-04-29) 3 commits
192
- promisor-remote: allow a client to check fields
@@ -196,26 +220,28 @@ Release tarballs are available at:
220
221
222
* ng/xdiff-truly-minimal (2025-04-29) 1 commit
199
- - xdiff: disable cleanup_records heuristic with --minimal
223
+ (merged to 'next' on 2025-05-05 at 62e0c33153)
224
+ + xdiff: disable cleanup_records heuristic with --minimal
225
226
"git diff --minimal" used to give non-minimal output when its
227
optimization kicked in, which has been disabled.
228
204
- Will merge to 'next'.
229
+ Will merge to 'master'.
230
source: <20250429140949.2634935-1-n.glodny@campus.lmu.de>
231
232
208
-* ds/scalar-no-maintenance (2025-04-30) 2 commits
233
+* ds/scalar-no-maintenance (2025-05-05) 4 commits
234
+ - scalar reconfigure: add --no-maintenance option
235
- scalar clone: add --no-maintenance option
236
- scalar register: add --no-maintenance option
237
+ - scalar: customize register_dir()'s behavior
238
239
Two "scalar" subcommands that adds a repository that hasn't been
240
under "scalar"'s control are taught an option not to enable the
241
scheduled maintenance on it.
242
216
- Expecting a reroll.
217
- cf. <b9a4dbf2-0064-4933-985f-b34dcb133030@gmail.com>
218
- source: <pull.1913.git.1746008680.gitgitgadget@gmail.com>
243
+ Will merge to 'next'?
244
+ source: <pull.1913.v2.git.1746458844.gitgitgadget@gmail.com>
245
246
247
* ps/mv-contradiction-fix (2025-04-30) 2 commits
@@ -232,15 +258,12 @@ Release tarballs are available at:
258
source: <20250430-pks-mv-parent-child-conflict-v1-0-11a87c55ffb9@pks.im>
259
260
235
-* cf/wrapper-netbsd-errno-eftype (2025-05-02) 1 commit
236
- - wrapper: NetBSD gives EFTYPE where POSIX uses ELOOP
237
-
238
- source: <20250502233403.289761-1-collin.funk1@gmail.com>
239
-
240
-
261
* en/get-tree-entry-doc (2025-05-02) 1 commit
262
- tree-walk.h: fix incorrect API comment
263
264
+ Doc update.
265
+
266
+ Will merge to 'next'.
267
source: <pull.1912.v2.git.1746213551473.gitgitgadget@gmail.com>
268
269
@@ -255,7 +278,7 @@ Release tarballs are available at:
278
source: <20250503011537.3035416-1-gitster@pobox.com>
279
280
258
-* jc/you-still-use-whatchanged (2025-05-02) 6 commits
281
+* jc/you-still-use-whatchanged (2025-05-05) 6 commits
282
- whatschanged: list it in BreakingChanges document
283
- whatchanged: remove when built with WITH_BREAKING_CHANGES
284
- whatchanged: require --i-still-use-this
@@ -270,33 +293,20 @@ Release tarballs are available at:
293
Comments?
294
source: <20250503005814.3030099-1-gitster@pobox.com>
295
273
---------------------------------------------------
274
-[Cooking]
296
297
* jc/ci-skip-unavailable-external-software (2025-04-25) 2 commits
277
- - ci: download JGit from maven, not eclipse.org
278
- - ci: update the message for unavailble third-party software
298
+ (merged to 'next' on 2025-05-05 at a13d958c1b)
299
+ + ci: download JGit from maven, not eclipse.org
300
+ + ci: update the message for unavailble third-party software
301
302
Further refinement on CI messages when an optional external
303
software is unavailable (e.g. due to third-party service outage).
304
283
- Will merge to 'next'.
305
+ Will merge to 'master'.
306
source: <20250425153827.147585-1-gitster@pobox.com>
307
308
287
-* js/ci-win-meson-timeout-workaround (2025-04-25) 1 commit
288
- - ci(win+Meson): build in Release mode, avoiding t7001-mv hangs
289
-
290
- win+Meson CI pipeline, unlike other pipelines for Windows,
291
- used to build artifacts in develper mode, which has been changed to
292
- build them in release mode for consistency.
293
-
294
- Expecting a reroll, stating an updated rationale for the change.
295
- cf. <xmqqjz6zuf80.fsf@gitster.g>
296
- source: <pull.1908.git.1745593515875.gitgitgadget@gmail.com>
297
-
298
-
299
-* ps/maintenance-missing-tasks (2025-05-02) 7 commits
309
+* ps/maintenance-missing-tasks (2025-05-05) 7 commits
310
- builtin/maintenance: introduce "rerere-gc" task
311
- builtin/gc: move rerere garbage collection into separate function
312
- builtin/maintenance: introduce "worktree-prune" task
@@ -308,47 +318,50 @@ Release tarballs are available at:
318
Make repository clean-up tasks "gc" can do available to "git
319
maintenance" front-end.
320
311
- Will merge to 'next'?
312
- source: <20250502-pks-maintenance-missing-tasks-v3-0-13e130d36640@pks.im>
321
+ Will merge to 'next'.
322
+ source: <20250505-pks-maintenance-missing-tasks-v4-0-141f4df906a1@pks.im>
323
324
325
* ag/send-email-outlook (2025-04-29) 2 commits
316
- - send-email: add --[no-]outlook-id-fix option
317
- - send-email: retrieve Message-ID from outlook SMTP server
326
+ (merged to 'next' on 2025-05-05 at c85e7a2e65)
327
+ + send-email: add --[no-]outlook-id-fix option
328
+ + send-email: retrieve Message-ID from outlook SMTP server
329
330
Update send-email to work better with Outlook's smtp server.
331
321
- Will merge to 'next'.
332
+ Will merge to 'master'.
333
source: <PN3PR01MB95973F4B26A8CE2BF17A3AB1B8842@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
334
source: <PN3PR01MB9597DA8661D1AFDF4C927A11B8812@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
335
336
337
* ds/fix-thin-fix (2025-04-28) 3 commits
327
- - index-pack: allow revisiting REF_DELTA chains
328
- - t5309: create failing test for 'git index-pack'
329
- - test-tool: add pack-deltas helper
338
+ (merged to 'next' on 2025-05-05 at 200a988f98)
339
+ + index-pack: allow revisiting REF_DELTA chains
340
+ + t5309: create failing test for 'git index-pack'
341
+ + test-tool: add pack-deltas helper
342
343
"git index-pack --fix-thin" used to abort to prevent a cycle in
344
delta chains from forming in a corner case even when there is no
345
such cycle.
346
335
- Will merge to 'next'.
347
+ Will merge to 'master'.
348
source: <pull.1906.v2.git.1745871885.gitgitgadget@gmail.com>
349
350
351
* ps/object-store-cleanup (2025-04-29) 8 commits
340
- - object-store: drop `repo_has_object_file()`
341
- - treewide: convert users of `repo_has_object_file()` to `has_object()`
342
- - object-store: allow fetching objects via `has_object()`
343
- - object-store: move function declarations to their respective subsystems
344
- - object-store: move and rename `odb_pack_keep()`
345
- - object-store: drop `loose_object_path()`
346
- - object-store: move `struct packed_git` into "packfile.h"
347
- - Merge branch 'ps/object-file-cleanup' into ps/object-store-cleanup
352
+ (merged to 'next' on 2025-05-05 at f91eca32c9)
353
+ + object-store: drop `repo_has_object_file()`
354
+ + treewide: convert users of `repo_has_object_file()` to `has_object()`
355
+ + object-store: allow fetching objects via `has_object()`
356
+ + object-store: move function declarations to their respective subsystems
357
+ + object-store: move and rename `odb_pack_keep()`
358
+ + object-store: drop `loose_object_path()`
359
+ + object-store: move `struct packed_git` into "packfile.h"
360
+ + Merge branch 'ps/object-file-cleanup' into ps/object-store-cleanup
361
362
Further code clean-up in the object-store layer.
363
351
- Will merge to 'next'.
364
+ Will merge to 'master'.
365
source: <20250429-pks-object-store-cleanups-v3-0-42902bad09a1@pks.im>
366
367
@@ -375,43 +388,14 @@ Release tarballs are available at:
388
389
390
* ps/meson-bin-sh (2025-04-25) 2 commits
378
- - meson: prefer shell at "/bin/sh"
379
- - meson: report detected runtime executable paths
391
+ (merged to 'next' on 2025-05-05 at 546cdf31bf)
392
+ + meson: prefer shell at "/bin/sh"
393
+ + meson: report detected runtime executable paths
394
395
Meson-based build framework update.
396
383
- Will merge to 'next'?
384
- source: <20250425-pks-meson-posix-shell-v3-0-01607a2e9334@pks.im>
385
-
386
-
387
-* es/meson-cleanup (2025-04-25) 6 commits
388
- (merged to 'next' on 2025-04-28 at 0cc8ee98dc)
389
- + meson: only check for missing networking syms on non-Windows; add compat impls
390
- + meson: fix typo in function check that prevented checking for hstrerror
391
- + meson: add a couple missing networking dependencies
392
- + meson: do a full usage-based compile check for sysinfo
393
- + meson: check for getpagesize before using it
394
- + meson: simplify and parameterize various standard function checks
395
-
396
- Code clean-up for meson-based build infrastructure.
397
-
397
Will merge to 'master'.
399
- source: <20250425053345.17288-1-eschwartz@gentoo.org>
400
-
401
-
402
-* js/windows-arm64 (2025-04-23) 6 commits
403
- (merged to 'next' on 2025-04-28 at c3d4cea333)
404
- + max_tree_depth: lower it for clangarm64 on Windows
405
- + mingw(arm64): do move the `/etc/git*` location
406
- + msvc: do handle builds on Windows/ARM64
407
- + mingw: do not use nedmalloc on Windows/ARM64
408
- + config.mak.uname: add support for clangarm64
409
- + bswap.h: add support for built-in bswap functions
410
-
411
- Update to arm64 Windows port.
412
-
413
- Will merge to 'master'.
414
- source: <pull.1904.v2.git.1745395308.gitgitgadget@gmail.com>
398
+ source: <20250425-pks-meson-posix-shell-v3-0-01607a2e9334@pks.im>
399
400
401
* sj/string-list-typefix (2025-04-22) 5 commits
@@ -459,37 +443,6 @@ Release tarballs are available at:
443
source: <cover.1744924321.git.me@ttaylorr.com>
444
445
462
-* ps/meson-build-perf-bench (2025-04-28) 5 commits
463
- (merged to 'next' on 2025-04-28 at f563542bfd)
464
- + meson: wire up benchmarking options
465
- + meson: wire up benchmarks
466
- + t/perf: fix benchmarks with out-of-tree builds
467
- + t/perf: use configured PERL_PATH
468
- + t/perf: fix benchmarks with alternate repo formats
469
-
470
- The build procedure based on Meson learned to drive the
471
- benchmarking tests.
472
-
473
- Will merge to 'master'.
474
- source: <20250428-pks-meson-benchmarks-v5-0-5010dd014d1d@pks.im>
475
-
476
-
477
-* kn/meson-hdr-check (2025-04-23) 7 commits
478
- (merged to 'next' on 2025-04-29 at c925448238)
479
- + makefile/meson: add 'check-headers' as alias for 'hdr-check'
480
- + meson: add support for 'hdr-check'
481
- + meson: rename 'third_party_sources' to 'third_party_excludes'
482
- + meson: move headers definition from 'contrib/coccinelle'
483
- + coccinelle: meson: rename variables to be more specific
484
- + ci/github: install git before checking out the repository
485
- + Merge branch 'es/meson-build-skip-coccinelle' into kn/meson-hdr-check
486
-
487
- Add an equivalent to "make hdr-check" target to meson based builds.
488
-
489
- Will merge to 'master'.
490
- source: <20250423-505-wire-up-sparse-via-meson-v5-0-d1e2be4b2078@gmail.com>
491
-
492
-
446
* pb/status-rebase-fixes (2025-03-28) 4 commits
447
- wt-status: suggest 'git rebase --continue' to conclude 'merge' instruction
448
- wt-status: also abbreviate 'merge' and 'fixup -C' lines during rebase