Re: [PATCH 000/141] V4L/DVB updates part 1

[Linus Torvalds]

On Tue, 21 Mar 2006, Linus Torvalds wrote:
> 
> In particular, commit e338b736f1aee59b757130ffdc778538b7db18d6 is crap, 
> crap, CRAP.

Looking closer, the commit after that is a _real_ merge, and it looks like 
you did something strange when that at first conflicted in saa7134-dvb.c 
or something. I just don't even see _how_ you created that bogus non-merge 
commit. Are you using cogito? It has some problems with conflict 
resolution, I think. Real git should not even have allowed you to commit 
something that hadn't been resolved.

Anyway, if you want to fix this up without re-doing _everything_, the way 
to do so is to just start a new branch, and cherry-pick the non-crap 
commits. So you can fix it up, largely automatedly, with git.

I'm actually trying to do that right now, to see if I can re-create your 
tree without the errors.

		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/