On Fri, Nov 06, 2015 at 10:32:56AM -0800, a...@clueserver.org wrote:
> > Yes. There is no defined format for merge patches, so git-format-patch
> > cannot show them. What you're trying to do won't work.
>
> This makes me worry about using git-format-patch. If it cannot handle
> merge commits corr
> On Thu, Nov 05, 2015 at 01:16:54PM -0800, a...@clueserver.org wrote:
>
>> I created an orphan branch from 3.12-rc1. I then used git format-patch
>> to
>> generate patches from 3.12-rc1 to HEAD. (Over 7000 patches.) I use git
>> am
>> to apply them to the orphan branch. At patch 237 it fails to ap
On Thu, Nov 05, 2015 at 07:18:32PM -0500, Jeff King wrote:
> Of course that leaves only the problem that filter-branch is
> horrendously slow (for the kernel, most of the time goes to populating
> the index for each commit; I think filter-branch could probably learn to
> skip this step if there is
On Thu, Nov 05, 2015 at 01:16:54PM -0800, a...@clueserver.org wrote:
> I created an orphan branch from 3.12-rc1. I then used git format-patch to
> generate patches from 3.12-rc1 to HEAD. (Over 7000 patches.) I use git am
> to apply them to the orphan branch. At patch 237 it fails to apply. (It
> a
I am trying to create an orphaned branch that contains the linux-3.12.y
branch from linux-stable. Each time I try a method to make this work I
encounter a blocker that halts my progress.
I expect that at least one of these is a bug, but I am not sure.
Here is what I did. I have read the docs and
5 matches
Mail list logo
