From: Andrew Wong <andrew.kw.w@gmail.com>
Date: Sun, 05 Jun 2011 14:11:11 GMT
Subject: Re: [PATCH] Interactive-rebase doesn't pick all children of "upstream"
Message-ID: <4DEB8E7F.60705@gmail.com>
In-Reply-To: <4DEB495F.9080900@kdbg.org>

On 11-06-05 5:16 AM, Johannes Sixt wrote:
> Am 05.06.2011 07:32, schrieb Andrew Wong:
>> Currently, (1) and (2) will pick B, D, C, and E onto A and F,
>> respectively.  However, (3) will only pick D and E onto B.  This
>> behavior of (3) is inconsistent with (1) and (2), and we cannot modify C
>> in the interactive-rebase.
> I cannot reproduce your claims:
>
> - (1) and (2) picks B,C,D top A and F, but not E because E is a merge.
>
> - (3) picks C and D, but not E because E is a merge.
Ah, all those commands should have "-p" on them to preserve the merges. 
Thanks for the catch!