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

Re: 'git rebase' silently drops changes?

From
Johannes Sixt <j6t@kdbg.org>
Date
Feb 8, 2015, 13:49 UTC
Message-ID
<54D7696B.3060407@kdbg.org>
In-Reply-To
<54D68455.5070305@gmail.com>
Am 07.02.2015 um 22:32 schrieb Sebastian Schuberth:
Show 13 quoted lines
> On 06.02.2015 22:28, Sergey Organov wrote:
> 
>> # Now rebase my work.
>> git rebase -f HEAD~1
>>
>> # What? Where is my "Precious" change in "a"???
>> cat a
>> </SCRIPT>
>>
>> I.e., the modification marked [!] was silently lost during rebase!
> 
> Just a wild guess: Maybe because you omitted "-p" / "--preserve-merges"
> from "git rebase"?

No, that would not help. --preserve-merges repeats the merge, but does not apply the amendment.

It's just how rebase works: It omits merge commits when it linearizes history.

Sergey, it is impossible for git rebase to decide to which rebased commit the amendement applies. It doesn't even try to guess. It's the responsibility of the user to apply the amendment to the correct commit.

-- Hannes
Previous: Sebastian SchuberthNext: Sergey Organov
Message 3 of 7 in “'git rebase' silently drops changes?”
  1. Sergey OrganovFeb 6, 2015
  2. Sebastian SchuberthFeb 7, 2015
  3. Johannes SixtFeb 8, 2015
  4. Sergey OrganovFeb 9, 2015
  5. Johannes SixtFeb 9, 2015
  6. Sergey OrganovFeb 10, 2015
  7. Johannes SixtFeb 10, 2015

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.