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

Re: [PATCH] doc: pull: fix rebase=false documentation

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 23, 2021, 21:44 UTC
Message-ID
<xmqqo8asln78.fsf@gitster.g>
In-Reply-To
<60fb0a916c9cc_defb208eb@natae.notmuch>
Felipe Contreras <felipe.contreras@gmail.com> writes:
Show 5 quoted lines
>> But that does not necessarily mean swapping the parent order would
>> produce the history of a right shape, either, even for those with
>> the "first-parent chain is the trunk" worldview.
>
> Why not?

I gave detailed write-up in two discussion threads linked already in this thread from 2013 and 2014; as I said, I do not think we want to debate that as part of the discussion of this documentation fix.

Previous: Felipe ContrerasNext: Felipe Contreras
Message 10 of 12 in “doc: pull: fix rebase=false documentation”
  1. doc: pull: fix rebase=false documentationFelipe Contreras, Jul 21, 2021
  2. Junio C HamanoJul 21, 2021
  3. Junio C HamanoJul 22, 2021
  4. Felipe ContrerasJul 22, 2021
  5. Jeff KingJul 23, 2021
  6. Philip OakleyJul 23, 2021
  7. Felipe ContrerasJul 23, 2021
  8. Junio C HamanoJul 23, 2021
  9. Felipe ContrerasJul 23, 2021
  10. Junio C HamanoJul 23, 2021
  11. Felipe ContrerasJul 24, 2021
  12. Felipe ContrerasJul 23, 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.