From: Linus Torvalds <torvalds@osdl.org>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: Andrew Morton <akpm@osdl.org>,
Netdev List <netdev@vger.kernel.org>,
Linux Kernel <linux-kernel@vger.kernel.org>
Subject: Re: [git patches] 2.6.x net driver updates
Date: Sat, 18 Jun 2005 10:51:59 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.58.0506181047190.2268@ppc970.osdl.org> (raw)
In-Reply-To: <42B456E2.8000500@pobox.com>
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.
Maybe.
> 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..
Linus
next parent reply other threads:[~2005-06-18 18:10 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <42B456E2.8000500@pobox.com>
2005-06-18 17:51 ` Linus Torvalds [this message]
2005-06-18 18:06 ` Linus Torvalds
2005-06-18 18:24 ` Linus Torvalds
2005-06-18 18:36 ` Jeff Garzik
2005-06-18 18:48 ` Linus Torvalds
2005-06-18 20:04 ` Jeff Garzik
2005-06-18 20:23 ` Linus Torvalds
2006-01-12 22:13 Jeff Garzik
2006-01-12 22:30 ` Linus Torvalds
2006-01-12 22:39 ` Andrew Morton
2006-01-12 22:46 ` Linus Torvalds
2006-01-13 17:56 ` Roman Zippel
2006-01-13 19:23 ` Jens Axboe
2006-01-13 19:28 ` Sam Ravnborg
2006-01-13 19:36 ` Jens Axboe
2006-01-14 2:29 ` Adrian Bunk
2006-01-14 5:05 ` Randy.Dunlap
2006-01-12 22:42 ` Jeff Garzik
2006-01-12 23:14 ` Adrian Bunk
-- strict thread matches above, loose matches on Subject: below --
2006-01-09 17:10 Jeff Garzik
2006-01-03 16:41 Jeff Garzik
2005-11-09 6:53 Jeff Garzik
2005-11-05 19:58 Jeff Garzik
2005-10-29 18:21 Jeff Garzik
2005-10-28 0:42 Jeff Garzik
[not found] <4292BA66.8070806@pobox.com>
2005-05-24 6:08 ` Linus Torvalds
2005-05-24 6:25 ` Jeff Garzik
2005-05-24 6:48 ` Linus Torvalds
2005-05-24 7:29 ` Jeff Garzik
2005-05-24 7:46 ` Linus Torvalds
2005-05-24 7:55 ` David Lang
2005-05-24 6:34 ` Jeff Garzik
2005-05-24 6:50 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.58.0506181047190.2268@ppc970.osdl.org \
--to=torvalds@osdl.org \
--cc=akpm@osdl.org \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®