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

Re: "git rebase" loses the additional changes in "evil" merges

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 5, 2013, 21:35 UTC
Message-ID
<7vy5e1sf6b.fsf@alter.siamese.dyndns.org>
In-Reply-To
<201303052118.r25LIoAC000463@freeze.ariadne.com>
Dale Worley <worley@c-66-31-108-177.hsd1.ma.comcast.net> writes:
Show 8 quoted lines
>> From: Junio C Hamano <gitster@pobox.com>
>> 
>> I think this is to be expected for "git rebase", as it does not even
>> look at merges.  It is a way to find non-merge commits that haven't
>> been applied yet, and apply them to the upstream to create a new
>> linear history.
>
> I disagree. "git rebase" is not characterized as ...

The intention has always been "I have these patches, some were applied upstream already, now what do I have left?".

You do realize that you are disagreeing with somebody who designed the original "git rebase" (before the --preserve-merges was added), do you?

Previous: Dale WorleyNext: Philip Oakley
Message 11 of 13 in “"git rebase" loses the additional changes in "evil" merges”
  1. Dale R. WorleyMar 4, 2013
  2. Junio C HamanoMar 4, 2013
  3. Thomas RastMar 4, 2013
  4. Junio C HamanoMar 4, 2013
  5. What I want rebase to doDale R. Worley, Mar 6, 2013
  6. Thomas RastMar 7, 2013
  7. Johannes SixtMar 7, 2013
  8. Junio C HamanoMar 7, 2013
  9. Dale R. WorleyMar 7, 2013
  10. Dale WorleyMar 5, 2013
  11. Junio C HamanoMar 5, 2013
  12. Philip OakleyMar 5, 2013
  13. Junio C HamanoMar 5, 2013

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.