Messages in this thread | | | Date | Tue, 21 Mar 2006 18:53:50 -0500 (EST) | From | Daniel Barkalow <> | Subject | Re: [PATCH 000/141] V4L/DVB updates part 1 |
| |
On Tue, 21 Mar 2006, Linus Torvalds wrote:
> On Tue, 21 Mar 2006, Mauro Carvalho Chehab wrote: > > > > Weird, I can't see all those stuff here. It shows something like > > (running from master copy at kernel.org): > > I just did the raw output, so my output was from > > git show --pretty=fuller -r e338b7 > > which isn't the default, but it's useful if you want to see both committer > and author information (and the raw format is just because I wasn't > interested in the diff itself, just looking at how many files where > changed). > > > So, after the merging message, I have a normal diff with: > > > > 179 files changed, 1274 insertions(+), 785 deletions(-) > > Yeah, we're talking about the same commit. > > > Seeming all perfect from my knowledge about git. > > It's a perfectly good commit. BUT IT IS NOT A MERGE, AND IT IS NOT A DIFF > THAT I WANT TO SEE COMING IN FROM AN OUTSIDE TREE!
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)?
I expect the source of the bad commit is losing that, although I don't know any obvious way to lose it (and still have the index contents which you're merging).
-Daniel *This .sig left intentionally blank* - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |