From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Sat, 07 Feb 2015 21:32:05 GMT
Subject: Re: 'git rebase' silently drops changes?
Message-ID: <54D68455.5070305@gmail.com>
In-Reply-To: <87386ispb3.fsf@osv.gnss.ru>

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"?

-- 
Sebastian Schuberth