Re: [GIT PULL] regulator fixes for v3.15

[Linus Torvalds]

On Fri, Apr 11, 2014 at 1:30 PM, Linus Torvalds
<torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> Not an immediate problem, but have you tested just adding a simple
> "git fetch" from my repo to your scripts?

Oh, actually, the problem may just be that back-merge you have. When
those cause multiple merge bases, "git diff" can no longer reliably
generate a diff, since there is no clear base for it. And then "git
fetch" to update my current state won't likely help, since the problem
isn't that you don't see my previous pull, the problem is that the
base isn't unique any more.

              Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/