What's cooking (2023/10 #03)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Oct 6, 2023 at 16:56 UTC
d988a4b8d744debfcf2e1bb22d463dbdcfda5373
1 file changed
+204
-177
whats-cooking.txt
+204
-177
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2023, #02; Wed, 4)
2
+Subject: What's cooking in git.git (Oct 2023, #03; Fri, 6)
3
X-master-at: 3a06386e314565108ad56a9bdb8f7b80ac52fb69
4
-X-next-at: 421f12c284626330cb1738d5e5e98c9ede1ec91e
4
+X-next-at: 5fc05c94dcc1fa9e0ac97428e887ec52d78ec652
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Oct 2023, #02; Wed, 4)
7
+What's cooking in git.git (Oct 2023, #03; Fri, 6)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -46,75 +46,158 @@ Release tarballs are available at:
46
https://www.kernel.org/pub/software/scm/git/
47
48
--------------------------------------------------
49
-[Graduated to 'master']
49
+[New Topics]
50
+
51
+* jc/merge-ort-attr-index-fix (2023-10-05) 1 commit
52
+ - merge-ort: initialize repo in index state
53
+
54
+ Fix "git merge-tree" to stop segfaulting when the --attr-source
55
+ option is used.
56
+
57
+ Waiting for review response.
58
+ source: <pull.1583.git.git.1696519349407.gitgitgadget@gmail.com>
59
+
60
51
-* bb/unicode-width-table-15 (2023-09-25) 1 commit
52
- (merged to 'next' on 2023-09-28 at bb76f46606)
53
- + unicode: update the width tables to Unicode 15.1
61
+* jk/decoration-and-other-leak-fixes (2023-10-05) 3 commits
62
+ (merged to 'next' on 2023-10-06 at 5fc05c94dc)
63
+ + daemon: free listen_addr before returning
64
+ + revision: clear decoration structs during release_revisions()
65
+ + decorate: add clear_decoration() function
66
55
- The display width table for unicode characters has been updated for
56
- Unicode 15.1
57
- source: <20230925190704.157731-1-dev+git@drbeat.li>
67
+ Leakfix.
68
+
69
+ Will merge to 'master'.
70
+ source: <20231005212802.GA982892@coredump.intra.peff.net>
71
72
60
-* jk/commit-graph-verify-fix (2023-09-28) 6 commits
61
- (merged to 'next' on 2023-09-28 at e3ed560a2f)
62
- + commit-graph: report incomplete chains during verification
63
- + commit-graph: tighten chain size check
64
- + commit-graph: detect read errors when verifying graph chain
65
- + t5324: harmonize sha1/sha256 graph chain corruption
66
- + commit-graph: check mixed generation validation when loading chain file
67
- + commit-graph: factor out chain opening function
73
+* sn/typo-grammo-phraso-fixes (2023-10-05) 5 commits
74
+ - t/README: fix multi-prerequisite example
75
+ - doc/gitk: s/sticked/stuck/
76
+ - git-jump: admit to passing merge mode args to ls-files
77
+ - doc/diff-options: improve wording of the log.diffMerges mention
78
+ - doc: fix some typos, grammar and wording issues
79
69
- Various fixes to "git commit-graph verify".
70
- source: <20230928043746.GB57926@coredump.intra.peff.net>
80
+ Many typos, ungrammatical sentences and wrong phrasing have been
81
+ fixed.
82
83
+ Needs review.
84
+ source: <20231003082107.3002173-1-stepnem@smrk.net>
85
73
-* ks/ref-filter-mailmap (2023-09-25) 3 commits
74
- (merged to 'next' on 2023-09-28 at 0d3fd9959a)
75
- + ref-filter: add mailmap support
76
- + t/t6300: introduce test_bad_atom
77
- + t/t6300: cleanup test_atom
86
79
- "git for-each-ref" and friends learn to apply mailmap to authorname
80
- and other fields.
81
- source: <20230925175050.3498-1-five231003@gmail.com>
87
+* so/diff-merges-dd (2023-10-05) 3 commits
88
+ - completion: complete '--dd'
89
+ - diff-merges: introduce '--dd' option
90
+ - diff-merges: improve --diff-merges documentation
91
92
+ "git log" and friends learned "--dd" that is a short-hand for
93
+ "--diff-merges=first-parent -p".
94
84
-* ps/revision-cmdline-stdin-not (2023-09-25) 1 commit
85
- (merged to 'next' on 2023-09-28 at a28201e0dd)
86
- + revision: make pseudo-opt flags read via stdin behave consistently
95
+ Expecting a reroll.
96
+ cf. <871qe7r3rk.fsf@osv.gnss.ru>
97
+ source: <20231004214558.210339-1-sorganov@gmail.com>
98
88
- "git rev-list --stdin" learned to take non-revisions (like "--not")
89
- recently from the standard input, but the way such a "--not" was
90
- handled was quite confusing, which has been rethought. This is
91
- potentially a change that breaks backward compatibility.
92
- source: <6221acd2796853144f8e84081655fbc79fdc6634.1695646898.git.ps@pks.im>
99
100
+* vd/loose-ref-iteration-optimization (2023-10-06) 4 commits
101
+ - files-backend.c: avoid stat in 'loose_fill_ref_dir'
102
+ - dir.[ch]: add 'follow_symlink' arg to 'get_dtype'
103
+ - dir.[ch]: expose 'get_dtype'
104
+ - ref-cache.c: fix prefix matching in ref iteration
105
95
-* xz/commit-title-soft-limit-doc (2023-09-28) 1 commit
96
- (merged to 'next' on 2023-09-28 at 20df852430)
97
- + doc: correct the 50 characters soft limit
106
+ The code to iterate over loose references have been optimized to
107
+ reduce the number of lstat() system calls.
108
+ source: <pull.1594.git.1696615769.gitgitgadget@gmail.com>
109
99
- Doc tweak.
100
- source: <pull.1580.git.git.1695895155985.gitgitgadget@gmail.com>
110
+
111
+* jc/update-list-references-to-lore (2023-10-06) 1 commit
112
+ - doc: update list archive reference to use lore.kernel.org
113
+
114
+ source: <xmqq7cnz741s.fsf@gitster.g>
115
116
--------------------------------------------------
103
-[New Topics]
117
+[Stalled]
118
+
119
+* cc/git-replay (2023-09-07) 15 commits
120
+ - replay: stop assuming replayed branches do not diverge
121
+ - replay: add --contained to rebase contained branches
122
+ - replay: add --advance or 'cherry-pick' mode
123
+ - replay: disallow revision specific options and pathspecs
124
+ - replay: use standard revision ranges
125
+ - replay: make it a minimal server side command
126
+ - replay: remove HEAD related sanity check
127
+ - replay: remove progress and info output
128
+ - replay: add an important FIXME comment about gpg signing
129
+ - replay: don't simplify history
130
+ - replay: introduce pick_regular_commit()
131
+ - replay: die() instead of failing assert()
132
+ - replay: start using parse_options API
133
+ - replay: introduce new builtin
134
+ - t6429: remove switching aspects of fast-rebase
135
+
136
+ Waiting for review response.
137
+ cf. <52277471-4ddd-b2e0-62ca-c2a5b59ae418@gmx.de>
138
+ cf. <58daa706-7efb-51dd-9061-202ef650b96a@gmx.de>
139
+ cf. <f0e75d47-c277-9fbb-7bcd-53e4e5686f3c@gmx.de>
140
+ source: <20230907092521.733746-1-christian.couder@gmail.com>
141
+
142
+
143
+* pw/rebase-sigint (2023-09-07) 1 commit
144
+ - rebase -i: ignore signals when forking subprocesses
145
+
146
+ If the commit log editor or other external programs (spawned via
147
+ "exec" insn in the todo list) receive internactive signal during
148
+ "git rebase -i", it caused not just the spawned program but the
149
+ "Git" process that spawned them, which is often not what the end
150
+ user intended. "git" learned to ignore SIGINT and SIGQUIT while
151
+ waiting for these subprocesses.
152
+
153
+ Expecting a reroll.
154
+ cf. <12c956ea-330d-4441-937f-7885ab519e26@gmail.com>
155
+ source: <pull.1581.git.1694080982621.gitgitgadget@gmail.com>
156
+
157
+
158
+* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
159
+ - cherry-pick: refuse cherry-pick sequence if index is dirty
160
+
161
+ "git cherry-pick A" that replays a single commit stopped before
162
+ clobbering local modification, but "git cherry-pick A..B" did not,
163
+ which has been corrected.
164
+
165
+ Expecting a reroll.
166
+ cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
167
+ source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
168
+
169
+
170
+* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits
171
+ - diff-lib: fix check_removed() when fsmonitor is active
172
+ - Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix
173
+ - Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix
174
+ (this branch uses jc/fake-lstat.)
175
+
176
+ The optimization based on fsmonitor in the "diff --cached"
177
+ codepath is resurrected with the "fake-lstat" introduced earlier.
178
+
179
+ It is unknown if the optimization is worth resurrecting, but in case...
180
+ source: <xmqqr0n0h0tw.fsf@gitster.g>
181
+
182
+--------------------------------------------------
183
+[Cooking]
184
185
* jk/commit-graph-leak-fixes (2023-10-03) 10 commits
106
- - commit-graph: clear oidset after finishing write
107
- - commit-graph: free write-context base_graph_name during cleanup
108
- - commit-graph: free write-context entries before overwriting
109
- - commit-graph: free graph struct that was not added to chain
110
- - commit-graph: delay base_graph assignment in add_graph_to_chain()
111
- - commit-graph: free all elements of graph chain
112
- - commit-graph: move slab-clearing to close_commit_graph()
113
- - merge: free result of repo_get_merge_bases()
114
- - commit-reach: free temporary list in get_octopus_merge_bases()
115
- - t6700: mark test as leak-free
186
+ (merged to 'next' on 2023-10-06 at 5d202ef8b9)
187
+ + commit-graph: clear oidset after finishing write
188
+ + commit-graph: free write-context base_graph_name during cleanup
189
+ + commit-graph: free write-context entries before overwriting
190
+ + commit-graph: free graph struct that was not added to chain
191
+ + commit-graph: delay base_graph assignment in add_graph_to_chain()
192
+ + commit-graph: free all elements of graph chain
193
+ + commit-graph: move slab-clearing to close_commit_graph()
194
+ + merge: free result of repo_get_merge_bases()
195
+ + commit-reach: free temporary list in get_octopus_merge_bases()
196
+ + t6700: mark test as leak-free
197
198
Leakfix.
199
+
200
+ Will merge to 'master'.
201
source: <20231003202504.GA7697@coredump.intra.peff.net>
202
203
@@ -138,17 +221,19 @@ Release tarballs are available at:
221
source: <ebcaa9e1-d306-4c93-adec-3f35d7040531@web.de>
222
223
141
-* tb/repack-max-cruft-size (2023-10-03) 4 commits
142
- - builtin/repack.c: avoid making cruft packs preferred
143
- - builtin/repack.c: implement support for `--max-cruft-size`
144
- - builtin/repack.c: parse `--max-pack-size` with OPT_MAGNITUDE
145
- - t7700: split cruft-related tests to t7704
224
+* tb/repack-max-cruft-size (2023-10-05) 4 commits
225
+ (merged to 'next' on 2023-10-06 at b3ca6df3b9)
226
+ + builtin/repack.c: avoid making cruft packs preferred
227
+ + builtin/repack.c: implement support for `--max-cruft-size`
228
+ + builtin/repack.c: parse `--max-pack-size` with OPT_MAGNITUDE
229
+ + t7700: split cruft-related tests to t7704
230
231
"git repack" learned "--max-cruft-size" to prevent cruft packs from
232
growing without bounds.
233
150
- Will merge to 'next'?
234
+ Will merge to 'master'.
235
source: <cover.1696293862.git.me@ttaylorr.com>
236
+ source: <035393935108d02aaf8927189b05102f4f74f340.1696370003.git.me@ttaylorr.com>
237
238
239
* ak/color-decorate-symbols (2023-10-03) 1 commit
@@ -172,12 +257,13 @@ Release tarballs are available at:
257
258
259
* js/submodule-fix-misuse-of-path-and-name (2023-10-03) 6 commits
175
- - t7420: test that we correctly handle renamed submodules
176
- - t7419: test that we correctly handle renamed submodules
177
- - t7419, t7420: use test_cmp_config instead of grepping .gitmodules
178
- - t7419: actually test the branch switching
179
- - submodule--helper: return error from set-url when modifying failed
180
- - submodule--helper: use submodule_from_path in set-{url,branch}
260
+ (merged to 'next' on 2023-10-06 at 1054b6e752)
261
+ + t7420: test that we correctly handle renamed submodules
262
+ + t7419: test that we correctly handle renamed submodules
263
+ + t7419, t7420: use test_cmp_config instead of grepping .gitmodules
264
+ + t7419: actually test the branch switching
265
+ + submodule--helper: return error from set-url when modifying failed
266
+ + submodule--helper: use submodule_from_path in set-{url,branch}
267
268
In .gitmodules files, submodules are keyed by their names, and the
269
path to the submodule whose name is $name is specified by the
@@ -188,38 +274,9 @@ Release tarballs are available at:
274
the problem does not surface until it is moved to a different path,
275
which apparently happens very rarely.
276
191
- Will merge to 'next'?
277
+ Will merge to 'master'.
278
source: <0a0a157f88321d25fdb0be771a454b3410a449f3.camel@archlinux.org>
279
194
---------------------------------------------------
195
-[Stalled]
196
-
197
-* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
198
- - cherry-pick: refuse cherry-pick sequence if index is dirty
199
-
200
- "git cherry-pick A" that replays a single commit stopped before
201
- clobbering local modification, but "git cherry-pick A..B" did not,
202
- which has been corrected.
203
-
204
- Expecting a reroll.
205
- cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
206
- source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
207
-
208
-
209
-* jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits
210
- - diff-lib: fix check_removed() when fsmonitor is active
211
- - Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix
212
- - Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix
213
- (this branch uses jc/fake-lstat.)
214
-
215
- The optimization based on fsmonitor in the "diff --cached"
216
- codepath is resurrected with the "fake-lstat" introduced earlier.
217
-
218
- It is unknown if the optimization is worth resurrecting, but in case...
219
- source: <xmqqr0n0h0tw.fsf@gitster.g>
220
-
221
---------------------------------------------------
222
-[Cooking]
280
281
* cw/prelim-cleanup (2023-09-29) 4 commits
282
(merged to 'next' on 2023-10-03 at 5985929612)
@@ -246,8 +303,15 @@ Release tarballs are available at:
303
304
305
* ar/diff-index-merge-base-fix (2023-10-02) 1 commit
249
- - diff: fix --merge-base with annotated tags
306
+ (merged to 'next' on 2023-10-06 at 0ff4dfc0e1)
307
+ + diff: fix --merge-base with annotated tags
308
309
+ "git diff --merge-base X other args..." insisted that X must be a
310
+ commit and errored out when given an annotated tag that peels to a
311
+ commit, but we only need it to be a committish. This has been
312
+ corrected.
313
+
314
+ Will merge to 'master'.
315
source: <20231001151845.3621551-1-hi@alyssa.is>
316
317
@@ -272,7 +336,7 @@ Release tarballs are available at:
336
Stale URLs have been updated to their current counterparts (or
337
archive.org) and HTTP links are replaced with working HTTPS links.
338
275
- Needs eyeballing.
339
+ Needs review.
340
source: <pull.1589.v2.git.1695553041.gitgitgadget@gmail.com>
341
342
@@ -322,8 +386,7 @@ Release tarballs are available at:
386
387
Teach a repository to work with both SHA-1 and SHA-256 hash algorithms.
388
325
- Breaks a few CI jobs when merged to 'seen'.
326
- cf. <xmqqbkdmjbkp.fsf@gitster.g>
389
+ Needs review.
390
source: <878r8l929e.fsf@gmail.froward.int.ebiederm.org>
391
392
@@ -336,6 +399,7 @@ Release tarballs are available at:
399
"git archive --remote=<remote>" learned to talk over the smart
400
http (aka stateless) transport.
401
402
+ Needs review.
403
source: <cover.1696432593.git.zhiyou.jx@alibaba-inc.com>
404
405
@@ -361,18 +425,18 @@ Release tarballs are available at:
425
source: <pull.1565.v6.git.1695522222723.gitgitgadget@gmail.com>
426
427
364
-* js/ci-coverity (2023-09-25) 7 commits
365
- - SQUASH???
366
- - coverity: detect and report when the token or project is incorrect
367
- - coverity: allow running on macOS
368
- - coverity: support building on Windows
369
- - coverity: allow overriding the Coverity project
370
- - coverity: cache the Coverity Build Tool
371
- - ci: add a GitHub workflow to submit Coverity scans
428
+* js/ci-coverity (2023-10-05) 6 commits
429
+ (merged to 'next' on 2023-10-05 at 253788f0d1)
430
+ + coverity: detect and report when the token or project is incorrect
431
+ + coverity: allow running on macOS
432
+ + coverity: support building on Windows
433
+ + coverity: allow overriding the Coverity project
434
+ + coverity: cache the Coverity Build Tool
435
+ + ci: add a GitHub workflow to submit Coverity scans
436
437
GitHub CI workflow has learned to trigger Coverity check.
438
375
- Looking good.
439
+ Will merge to 'master'.
440
source: <pull.1588.v2.git.1695642662.gitgitgadget@gmail.com>
441
442
@@ -385,6 +449,8 @@ Release tarballs are available at:
449
450
The parsing routines for the configuration files have been split
451
into a separate file.
452
+
453
+ Needs review.
454
source: <cover.1695330852.git.steadmon@google.com>
455
456
@@ -407,7 +473,7 @@ Release tarballs are available at:
473
object to a new command line option of "git rev-list", so that the
474
objects that are required but are missing can be enumerated.
475
410
- Waiting for review response.
476
+ What's the status of this thing?
477
source: <20230920104507.21664-1-karthik.188@gmail.com>
478
479
@@ -418,21 +484,10 @@ Release tarballs are available at:
484
A bit of type safety for the "value" pointer used in the
485
parse-options API.
486
421
- Comments?
487
+ What's the status of this thing?
488
source: <e6d8a291-03de-cfd3-3813-747fc2cad145@web.de>
489
490
425
-* so/diff-merges-d (2023-09-11) 2 commits
426
- - diff-merges: introduce '-d' option
427
- - diff-merges: improve --diff-merges documentation
428
-
429
- Teach a new "-d" option that shows the patch against the first
430
- parent for merge commits (which is "--diff-merges=first-parent -p").
431
-
432
- Letting a less useful combination of options squat on short-and-sweet "-d" feels dubious.
433
- source: <20230909125446.142715-1-sorganov@gmail.com>
434
-
435
-
491
* cc/repack-sift-filtered-objects-to-separate-pack (2023-10-02) 9 commits
492
(merged to 'next' on 2023-10-03 at e5a4824609)
493
+ gc: add `gc.repackFilterTo` config option
@@ -453,62 +508,25 @@ Release tarballs are available at:
508
source: <20231002165504.1325153-1-christian.couder@gmail.com>
509
510
456
-* pw/rebase-sigint (2023-09-07) 1 commit
457
- - rebase -i: ignore signals when forking subprocesses
458
-
459
- If the commit log editor or other external programs (spawned via
460
- "exec" insn in the todo list) receive internactive signal during
461
- "git rebase -i", it caused not just the spawned program but the
462
- "Git" process that spawned them, which is often not what the end
463
- user intended. "git" learned to ignore SIGINT and SIGQUIT while
464
- waiting for these subprocesses.
465
-
466
- Expecting a reroll.
467
- cf. <12c956ea-330d-4441-937f-7885ab519e26@gmail.com>
468
- source: <pull.1581.git.1694080982621.gitgitgadget@gmail.com>
469
-
470
-
471
-* cc/git-replay (2023-09-07) 15 commits
472
- - replay: stop assuming replayed branches do not diverge
473
- - replay: add --contained to rebase contained branches
474
- - replay: add --advance or 'cherry-pick' mode
475
- - replay: disallow revision specific options and pathspecs
476
- - replay: use standard revision ranges
477
- - replay: make it a minimal server side command
478
- - replay: remove HEAD related sanity check
479
- - replay: remove progress and info output
480
- - replay: add an important FIXME comment about gpg signing
481
- - replay: don't simplify history
482
- - replay: introduce pick_regular_commit()
483
- - replay: die() instead of failing assert()
484
- - replay: start using parse_options API
485
- - replay: introduce new builtin
486
- - t6429: remove switching aspects of fast-rebase
487
-
488
- Waiting for review response.
489
- cf. <52277471-4ddd-b2e0-62ca-c2a5b59ae418@gmx.de>
490
- cf. <58daa706-7efb-51dd-9061-202ef650b96a@gmx.de>
491
- cf. <f0e75d47-c277-9fbb-7bcd-53e4e5686f3c@gmx.de>
492
- May want to wait until tb/repack-existing-packs-cleanup stabilizes.
493
- source: <20230907092521.733746-1-christian.couder@gmail.com>
494
-
495
-
511
* la/trailer-test-and-doc-updates (2023-09-07) 13 commits
497
- - trailer doc: <token> is a <key> or <keyAlias>, not both
498
- - trailer doc: separator within key suppresses default separator
499
- - trailer doc: emphasize the effect of configuration variables
500
- - trailer --unfold help: prefer "reformat" over "join"
501
- - trailer --parse docs: add explanation for its usefulness
502
- - trailer --only-input: prefer "configuration variables" over "rules"
503
- - trailer --parse help: expose aliased options
504
- - trailer --no-divider help: describe usual "---" meaning
505
- - trailer: trailer location is a place, not an action
506
- - trailer doc: narrow down scope of --where and related flags
507
- - trailer: add tests to check defaulting behavior with --no-* flags
508
- - trailer test description: this tests --where=after, not --where=before
509
- - trailer tests: make test cases self-contained
512
+ (merged to 'next' on 2023-10-06 at 69fef35819)
513
+ + trailer doc: <token> is a <key> or <keyAlias>, not both
514
+ + trailer doc: separator within key suppresses default separator
515
+ + trailer doc: emphasize the effect of configuration variables
516
+ + trailer --unfold help: prefer "reformat" over "join"
517
+ + trailer --parse docs: add explanation for its usefulness
518
+ + trailer --only-input: prefer "configuration variables" over "rules"
519
+ + trailer --parse help: expose aliased options
520
+ + trailer --no-divider help: describe usual "---" meaning
521
+ + trailer: trailer location is a place, not an action
522
+ + trailer doc: narrow down scope of --where and related flags
523
+ + trailer: add tests to check defaulting behavior with --no-* flags
524
+ + trailer test description: this tests --where=after, not --where=before
525
+ + trailer tests: make test cases self-contained
526
527
Test coverage for trailers has been improved.
528
+
529
+ Will merge to 'master'.
530
source: <pull.1564.v3.git.1694125209.gitgitgadget@gmail.com>
531
532
@@ -520,8 +538,8 @@ Release tarballs are available at:
538
539
Process to add some form of low-level unit tests has started.
540
523
- Waiting for review response.
524
- cf. <xmqq350hw6n7.fsf@gitster.g>
541
+ Expecting a reroll.
542
+ cf. <0b6de919-8dbf-454f-807b-5abb64388cb7@gmail.com>
543
source: <cover.1692297001.git.steadmon@google.com>
544
545
@@ -537,7 +555,8 @@ Release tarballs are available at:
555
556
Update the base topic to work with CMake builds.
557
540
- Waiting for the base topic to settle.
558
+ Expecting a reroll.
559
+ cf. <ZSCRFNkzXZb3fBaU@google.com>
560
source: <pull.1579.v3.git.1695640836.gitgitgadget@gmail.com>
561
562
@@ -562,7 +581,7 @@ Release tarballs are available at:
581
on systems whose "char" is unsigned; update the implementation and
582
bump the format version to 2.
583
565
- Still being discussed.
584
+ What's the status of this thing?
585
cf. <20230830200218.GA5147@szeder.dev>
586
cf. <20230901205616.3572722-1-jonathantanmy@google.com>
587
cf. <20230924195900.GA1156862@szeder.dev>
@@ -618,3 +637,11 @@ Release tarballs are available at:
637
cf. <xmqqy1hfrk6p.fsf@gitster.g>
638
cf. <20230915183927.1597414-1-jonathantanmy@google.com>
639
source: <20230908174134.1026823-1-calvinwan@google.com>
640
+
641
+
642
+* so/diff-merges-d (2023-09-11) 2 commits
643
+ - diff-merges: introduce '-d' option
644
+ - diff-merges: improve --diff-merges documentation
645
+
646
+ Superseded by the so/diff-merges-dd topic.
647
+ source: <20230909125446.142715-1-sorganov@gmail.com>