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

Re: Draft of Git Rev News edition 38

From
Sergey Organov <sorganov@gmail.com>
Date
Apr 16, 2018, 15:19 UTC
Message-ID
<87efjf6uwg.fsf@javad.com>
In-Reply-To
<72f42205-c9c6-03aa-e8df-12e7062e8e62@gmail.com>
Kaartic Sivaraam <kaartic.sivaraam@gmail.com> writes:
Show 24 quoted lines
> Hi,
>
> On Monday 16 April 2018 08:33 PM, Sergey Organov wrote:
>> Christian Couder <christian.couder@gmail.com> writes:
>>> Here "the above article" means the Jake's "branch -l: print useful
>>> info whilst rebasing a non-local branch" article above the current
>>> article.
>
> Just a little correction. I suppose Chris actually meant the "rebase -i:
> offer to recreate merge commits" article written by Jake and not the
> "branch -l: print useful info whilst rebasing a non-local branch" article.
>
> That said, I read the draft and found it good except for two minor issues,
>
> 1. I see the following sentence in the "Rebasing merges: a jorney to the
> ultimate solution (Road Clear) (written by Jacob Keller)" article
>
> 	"A few examples were tried, but it was proven that the original
> 	concept did not work, as dropped commits could end up being
> 	replaid into the merge commits, turning them into "evil"
> 	merges."
>
> I'm not sure if 'replaid' is proper English assuming the past tense of
> replay was intended there (which I think is 'replayed').
It could have meant, say, "reapplied", -- we need to ask the author.

While we are at it, please also consider to replace "original concept" by "original algorithm", as it didn't work due to a mistake in the algorithm as opposed to failure of the concept itself.

-- Sergey
Previous: Kaartic SivaraamNext: Christian Couder
Message 7 of 13 in “Draft of Git Rev News edition 38”
  1. Christian CouderApr 15, 2018
  2. Christian CouderApr 16, 2018
  3. Sergey OrganovApr 16, 2018
  4. Christian CouderApr 16, 2018
  5. Sergey OrganovApr 16, 2018
  6. Kaartic SivaraamApr 16, 2018
  7. Sergey OrganovApr 16, 2018
  8. Christian CouderApr 16, 2018
  9. Jacob KellerApr 17, 2018
  10. Christian CouderApr 16, 2018
  11. Kaartic SivaraamApr 17, 2018
  12. Christian CouderApr 17, 2018
  13. Jacob KellerApr 16, 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.