From: "Jörn Engel" <joern@wohnheim.fh-wedel.de>
To: Josh Boyer <jwboyer@gmail.com>
Cc: linux-mtd@lists.infradead.org, David Woodhouse <dwmw2@infradead.org>
Subject: Re: [HOWTO] Using git for mtd (v3)
Date: Sun, 23 Apr 2006 15:16:43 +0200 [thread overview]
Message-ID: <20060423131643.GD19326@wohnheim.fh-wedel.de> (raw)
In-Reply-To: <625fc13d0604230605s4ef156aev67d498eed9be629b@mail.gmail.com>
On Sun, 23 April 2006 08:05:57 -0500, Josh Boyer wrote:
>
> > 4. Fetch mtd tree
> >
> > $ git fetch mtd
>
> Does that really do what you want though? It will fetch the objects
> from the mtd-2.6 tree, but it doesn't merge them into your local tree
> from what I remember. So to actually get the changes into the source,
> you'd have to do 'git fetch mtd'; 'git merge', no?
That doesn't do a merge, correct. I was told that a merge is to be
avoided at all costs. What it does is create a branch that i switch
to in step 5.
Jörn
--
Beware of bugs in the above code; I have only proved it correct, but
not tried it.
-- Donald Knuth
next prev parent reply other threads:[~2006-04-23 13:18 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-22 16:51 [HOWTO] Using git for mtd Jörn Engel
2006-04-22 17:11 ` Jörn Engel
2006-04-23 0:09 ` Josh Boyer
2006-04-23 1:24 ` Jörn Engel
2006-04-23 12:08 ` David Woodhouse
2006-04-23 12:17 ` Jörn Engel
2006-04-23 12:23 ` David Woodhouse
2006-04-23 12:20 ` David Woodhouse
2006-04-23 12:27 ` [HOWTO] Using git for mtd (v3) Jörn Engel
2006-04-23 13:05 ` Josh Boyer
2006-04-23 13:16 ` Jörn Engel [this message]
2006-04-23 13:12 ` David Woodhouse
2006-04-23 13:27 ` David Woodhouse
2006-04-23 13:40 ` [HOWTO] Using git for mtd (v4) Jörn Engel
2006-04-23 16:04 ` David Woodhouse
2006-04-23 17:46 ` [HOWTO] Using git for mtd (v3) Nicolas Pitre
2006-04-23 17:56 ` Jörn Engel
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=20060423131643.GD19326@wohnheim.fh-wedel.de \
--to=joern@wohnheim.fh-wedel.de \
--cc=dwmw2@infradead.org \
--cc=jwboyer@gmail.com \
--cc=linux-mtd@lists.infradead.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