git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 0/3] rebase -r: support octopus merges

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jul 12, 2018, 12:49 UTC
Message-ID
<nycvar.QRO.7.76.6.1807121448530.75@tvgsbejvaqbjf.bet>
In-Reply-To
<xmqqbmbd3cc3.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Wed, 11 Jul 2018, Junio C Hamano wrote:
Show 21 quoted lines
> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
> 
> > The `--rebase-merges` option of `git rebase` generates todo lists that
> > include the merge commits that are to be rebased.
> >
> > To keep things simpler to review, I decided to support only regular,
> > 2-parent merge commits first.
> >
> > With this patch series, support is extended to cover also octopus
> > merges.
> 
> ;-)
> 
> To be honest, I am not sure if there still are people who use octopus
> (even though I freely admit that I am guilty of inventing the term and
> the mechanism), given its downsides, primary one of which is that it
> makes bisection less efficient.
> 
> Nevertheless, this *is* the right thing to do from feature completeness
> point of view.  Thanks for following it through.

--preserve-merges supports octopus merges, IIRC. And as I want to deprecate --preserve-merges, --rebase-merges *has* to support octopus merges, whether you or I would ever use them or not.

Ciao, Dscho

Previous: Junio C Hamano
Message 20 of 20 in “rebase -r: support octopus merges”
  1. 0/3 rebase -r: support octopus mergesJohannes Schindelin via GitGitGadget, Jul 11, 2018
  2. 2/3 rebase --rebase-merges: add support for octopus mergesJohannes Schindelin via GitGitGadget, Dec 21, 2017
  3. Eric SunshineJul 11, 2018
  4. Junio C HamanoJul 11, 2018
  5. Johannes SchindelinJul 12, 2018
  6. Johannes SchindelinJul 12, 2018
  7. 1/3 merge: allow reading the merge commit message from a fileJohannes Schindelin via GitGitGadget, Dec 22, 2017
  8. Junio C HamanoJul 11, 2018
  9. Johannes SchindelinJul 12, 2018
  10. Junio C HamanoJul 12, 2018
  11. 3/3 rebase --rebase-merges: adjust man page for octopus supportJohannes Schindelin via GitGitGadget, Mar 9, 2018
  12. Elijah NewrenJul 11, 2018
  13. Johannes SchindelinJul 12, 2018
  14. Junio C HamanoJul 11, 2018
  15. Stefan BellerJul 11, 2018
  16. Johannes SchindelinJul 12, 2018
  17. Junio C HamanoJul 12, 2018
  18. Johannes SixtJul 13, 2018
  19. Junio C HamanoJul 16, 2018
  20. Johannes SchindelinJul 12, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.