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

Re: 'git rebase' silently drops changes?

From
Sebastian Schuberth <sschuberth@gmail.com>
Date
Feb 7, 2015, 21:32 UTC
Message-ID
<54D68455.5070305@gmail.com>
In-Reply-To
<87386ispb3.fsf@osv.gnss.ru>
On 06.02.2015 22:28, Sergey Organov wrote:
Show 8 quoted lines
> # 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"?

-- 
Sebastian Schuberth
Previous: Sergey OrganovNext: Johannes Sixt
Message 2 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.