Thread (55 messages) 55 messages, 7 authors, 4h ago

Re: [PATCH v7 0/3] Teach git-replay(1) to linearize merge commits

From: Junio C Hamano <hidden>
Date: 2026-07-08 01:02:14

Toon Claes [off-list ref] writes:
This series might conflict with Kristoffer's series to make
documentation changes[2], but should be trivial to resolve. And I don't
think there's a conflict with Patrick's series on adding "drop" to
git-history(1)[3].

dscho's series to replay merges[1] needs a bit of rework to fit on top
of this, but I'm happy to help figuring that out. We've been discussing
to either name the option --flatten or --linearize, but I've decided on
"linearize" because the documentation of git-rebase(1) also mentions
"linearize".

[1]: [ref]
[2]: [ref]
[3]: [ref]

---
Changes in v7:
- Allow --revert and --linearize to be used together.
- Because quite a lot of changes have been made since the original
  patch, change author from Johannes to Toon for the last commit.
  Johannes already told me he doesn't really care about authorship when
  he initially shared the patch with me.
Looks like all the previous review comments have been answered and
the topic is in a good shape to be merged to 'next' (and allow us to
polish incrementally as needed)?

Thanks for working on the topic.  Let me mark it for 'next'.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help