Re: [git patches] 2.6.x net driver updates

From: Linus Torvalds
Date: Sat Jun 18 2005 - 13:18:43 EST

On Sat, 18 Jun 2005, Linus Torvalds wrote:
> On Sat, 18 Jun 2005, Jeff Garzik wrote:
> >
> > GIT NOTE 1: The top-of-tree cset is the result of my use of the new git
> > conflict merging code. It seemed to work quite nicely. I did:
> >
> > git-pull-script $vanilla_linus_repo # conflicts appeared
> > vi drivers/net/r8169.c # fix conflict
> > git-update-cache drivers/net/r8169.c
> > git-commit-tree ...
> The last step can be just "git commit", and it will do the right thing
> these days (and with a nice big warnign that it looks like you're
> committing a merge).

In fact, your last commit was broken, exactly because you had _not_ done
this part right.

Your parent information was crap, meaning that when I pulled, I had to
re-merge. In fact, I'm going to undo this pull entirely, because of this -
it's simply _wrong_. You claim to have done a merge and indeed your "data"
is merged, but your history is totally buggered because you didn't do the
proper parents.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at