From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <mgreer@mvista.com>
Date: Thu, 19 Jul 2007 08:58:15 -0700
From: "Mark A. Greer" <mgreer@mvista.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: Do we need to reset the master branch?
Message-ID: <20070719155815.GA21186@mag.az.mvista.com>
References: <20070719151746.GB20538@mag.az.mvista.com>
	<20070720012708.91c77527.sfr@canb.auug.org.au>
	<20070719153217.GC20538@mag.az.mvista.com>
	<20070720014432.a46164a8.sfr@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
In-Reply-To: <20070720014432.a46164a8.sfr@canb.auug.org.au>
Cc: linuxppc-dev <Linuxppc-dev@ozlabs.org>, Paul Mackerras <paulus@samba.org>
List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.ozlabs.org>
List-Unsubscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
	<mailto:linuxppc-dev-request@ozlabs.org?subject=unsubscribe>
List-Archive: <http://ozlabs.org/pipermail/linuxppc-dev>
List-Post: <mailto:linuxppc-dev@ozlabs.org>
List-Help: <mailto:linuxppc-dev-request@ozlabs.org?subject=help>
List-Subscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
	<mailto:linuxppc-dev-request@ozlabs.org?subject=subscribe>

On Fri, Jul 20, 2007 at 01:44:32AM +1000, Stephen Rothwell wrote:
> 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.

Oh, that's cool  Thanks Stephen.

Mark