From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Mark A. Greer" <mgreer@mvista.com>
Cc: linuxppc-dev <Linuxppc-dev@ozlabs.org>,
Paul Mackerras <paulus@samba.org>
Subject: Re: Do we need to reset the master branch?
Date: Fri, 20 Jul 2007 01:44:32 +1000 [thread overview]
Message-ID: <20070720014432.a46164a8.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20070719153217.GC20538@mag.az.mvista.com>
[-- Attachment #1: Type: text/plain, Size: 814 bytes --]
On Thu, 19 Jul 2007 08:32:17 -0700 "Mark A. Greer" <mgreer@mvista.com> wrote:
>
> I was in the master branch of powerpc.git and did a 'git-pull'
Sorry, I hadn't updated since this afternoon. Looks like Paul has reset
his master tree to be the same as Linus', so you do need to do a reset.
Or checkout a separate branch and use
git fetch -f <powerpc.git tree> master:<whatever branch tracks master>
Using recent git (after 1.5.something), you can track the whole powerpc
tree like this:
git remote add powerpc git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git
git fetch powerpc
This will track the tree in branches called powerpc/<branch> and do
resets as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2007-07-19 15:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-19 15:17 Do we need to reset the master branch? Mark A. Greer
2007-07-19 15:27 ` Stephen Rothwell
2007-07-19 15:32 ` Mark A. Greer
2007-07-19 15:44 ` Stephen Rothwell [this message]
2007-07-19 15:46 ` Stephen Rothwell
2007-07-19 15:58 ` Mark A. Greer
2007-07-19 15:58 ` Mark A. Greer
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=20070720014432.a46164a8.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Linuxppc-dev@ozlabs.org \
--cc=mgreer@mvista.com \
--cc=paulus@samba.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