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

[Mauro Carvalho Chehab]

Em Ter, 2006-03-21 às 18:53 -0500, Daniel Barkalow escreveu:
> On Tue, 21 Mar 2006, Linus Torvalds wrote:

> Isn't this what you'd get if you accidentally removed .git/MERGE_HEAD 
> while trying to resolve a merge, and then absent-mindedly described what 
> you'd done in the commit message (forgetting that it ought to have 
> generated the commit message for you in this situation)?
For sure I didn't this by hand. The only possibility is that git, for
some unknown reason, decided to remove it by itself. Maybe another git
command in-between git pull and git commit might do it, without
reverting to its previous state?

Cheers, 
Mauro.

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