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

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

From
Stefan Beller <sbeller@google.com>
Date
Jul 11, 2018, 17:47 UTC
Message-ID
<CAGZ79kaYpw9t3kCvPnDiLc5z7cLFsVQv4XJDAff_T-bShEjPoQ@mail.gmail.com>
In-Reply-To
<xmqqbmbd3cc3.fsf@gitster-ct.c.googlers.com>
On Wed, Jul 11, 2018 at 10:35 AM Junio C Hamano <gitster@pobox.com> wrote:
> To be honest, I am not sure if there still are people who use
> octopus

The latest merge with more than 2 parents in linux.git is df958569dbaa (Merge branches 'acpi-tables' and 'acpica', 2018-07-05), although looking through the log of octopusses I get the impression that mostly Rafael J. Wysocki <rafael.j.wysocki@intel.com> is really keen on these. :-)

Previous: Junio C HamanoNext: Johannes Schindelin
Message 15 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.