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

Re: Can git change?

From
Martin von Zweigbergk <martinvonz@gmail.com>
Date
Jan 22, 2021, 22:43 UTC
Message-ID
<CANiSa6gEJ8ezVLhHf+TkGpqvEwvb8HhqtU3ETKiopjLQj6E_QQ@mail.gmail.com>
In-Reply-To
<xmqqpn1w95dj.fsf@gitster.c.googlers.com>
On Fri, Jan 22, 2021 at 9:39 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> *1* subtree merging of gitk and git-gui, for an example, and having
>     an octopus merge in the history is another.

This is probably quite off topic for the thread, but I'm curious why you think it was a bad idea to have octopus merges in git.git's history (there seem to be 37 of them).

Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 12 in “Can git change?”
  1. Patricia B. C.Jan 22, 2021
  2. Christian CouderJan 22, 2021
  3. Junio C HamanoJan 22, 2021
  4. Martin von ZweigbergkJan 22, 2021
  5. Junio C HamanoJan 23, 2021
  6. RES: Can git change?Patricia B. C., Jan 23, 2021
  7. Johannes SchindelinJan 25, 2021
  8. Junio C HamanoJan 26, 2021
  9. Patricia B. C.Jan 26, 2021
  10. Daniel GruessoMar 9, 2021
  11. Johannes SchindelinMar 10, 2021
  12. Junio C HamanoMar 10, 2021

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.