From: Max Horn <max@quendi.de>
Date: Fri, 08 Mar 2013 18:47:15 GMT
Subject: Re: rebase: strange failures to apply patc 3-way
Message-ID: <B21B6CEC-7507-47A1-9BBB-FB95EA6B831F@quendi.de>
In-Reply-To: <CADgNjan9v++__TSPE55j7+=BBZrVEkMD52O+9kXAm-C8SRV+Ww@mail.gmail.com>



Am 08.03.2013 um 19:02 schrieb Andrew Wong <andrew.kw.w@gmail.com>:

> On 3/8/13, Max Horn <max@quendi.de> wrote:
>> I tried this a dozen times, but 'git apply' failed to fail even once. No
>> surprise there, given that the patch that throws off rebase every time is
>> clean and simple. I am flabbergasted :-(
> 
> Hm, what if you add in the "--index" flag? i.e.
>    git apply --index .git/rebase-apply/patch
> 
> Wonder if that makes any difference...

Same result, it works fine.