Re: 'git rebase' silently drops changes?

From: Johannes Sixt <j6t@kdbg.org>
Date: Feb 10, 2015, 18:26 UTC
Message-ID: <54DA4D4B.5010902@kdbg.org>
In-Reply-To: <87pp9ivvir.fsf@osv.gnss.ru>

Am 10.02.2015 um 12:46 schrieb Sergey Organov:

Show 17 quoted lines

> Johannes Sixt <j6t@kdbg.org> writes:
> 
>> Am 09.02.2015 um 13:53 schrieb Sergey Organov:
> 
> [...]
> 
>> If you want a version of --preserve-merges that does what *you* need,
>> consider this commit:
>>
>>   git://repo.or.cz/git/mingw/j6t.git rebase-p-first-parent
>>
>> Use it like this:
>>
>>   git rebase -i -p --first-parent ...
> 
> Thanks a lot, this sounds promising! I've read the message for this
> commit and it mentions no drawbacks. Are you aware of any?

Except for this...

>> Beware, its implementation is incomplete: if the rebase is interrupted,
>> then 'git rebase --continue' behaves as if --first-parent were not
>> given.

... not anything that I would care about. Of course, you can't rebase branchy history when this option is specified, but that's the whole point.

> Just never did get round to it, or something more fundamental?

Nothing fundamental. Just has to store the option in the rebase state like all the other options.

-- Hannes