Re: [PATCH 000/141] V4L/DVB updates part 1
From: Linus Torvalds
Date: Tue Mar 21 2006 - 10:45:08 EST
On Mon, 20 Mar 2006, mchehab@xxxxxxxxxxxxx wrote:
> Linus, please pull these from master branch.
No. You have totally destroyed your git tree.
In particular, commit e338b736f1aee59b757130ffdc778538b7db18d6 is crap,
It's "Merging Linus tree", but it's not a merge at all: you have just
applied the _patch_ to merge the changes in my tree, but you haven't
actually told git to do so.
I don't know how/why you did that, but it's totally bogus, and I refuse to
pull from that tree. That's a 5000+ line diff, affecting about 180 files!
Now, when I pull from your tree, since the changes are already in mine,
git is smart and it will all _merge_ fine, and there are no changes to
those files as far as the end result is concerned. But that's still damn
Have you done things like that before, and I just didn't notice? And why?
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/