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

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

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, it's much preferable that you use "git commit", because it will
also then remove the old MERGE_HEAD if the commit was successful, leaving
the state proper (so that subsequent "git commit" things don't think it's
a merge). It also makes it less likely that you forget your parents.

> GIT NOTE 2: After doing a lot of simple+automatic merging, over time, I
> have a lot of .merge_* files. Would be nice is git-resolve-script, or
> whomever, would clean up after itself.

Yeah, something as simple as

rm -f .merge_file_*

in git-resolve-script should fix it..

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