From: Andrew Wong <andrew.kw.w@gmail.com>
Date: Fri, 08 Mar 2013 18:02:21 GMT
Subject: Re: rebase: strange failures to apply patc 3-way
Message-ID: <CADgNjan9v++__TSPE55j7+=BBZrVEkMD52O+9kXAm-C8SRV+Ww@mail.gmail.com>
In-Reply-To: <205D17C4-F737-46E9-BC48-D16D5948C707@quendi.de>

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...