From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <sfr@canb.auug.org.au>
Date: Fri, 20 Jul 2007 01:44:32 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Mark A. Greer" <mgreer@mvista.com>
Subject: Re: Do we need to reset the master branch?
Message-Id: <20070720014432.a46164a8.sfr@canb.auug.org.au>
In-Reply-To: <20070719153217.GC20538@mag.az.mvista.com>
References: <20070719151746.GB20538@mag.az.mvista.com>
	<20070720012708.91c77527.sfr@canb.auug.org.au>
	<20070719153217.GC20538@mag.az.mvista.com>
Mime-Version: 1.0
Content-Type: multipart/signed; protocol="application/pgp-signature";
	micalg="PGP-SHA1";
	boundary="Signature=_Fri__20_Jul_2007_01_44_32_+1000_V5Qr=U+x7I=h8zRn"
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>

--Signature=_Fri__20_Jul_2007_01_44_32_+1000_V5Qr=U+x7I=h8zRn
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, 19 Jul 2007 08:32:17 -0700 "Mark A. Greer" <mgreer@mvista.com> wrot=
e:
>
> 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.

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

--Signature=_Fri__20_Jul_2007_01_44_32_+1000_V5Qr=U+x7I=h8zRn
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFGn4bkTgG2atn1QN8RAm8DAJ4+mZYbnWpuqNvOzrQQzHMiwl0qPACfbBFv
mJoev8CkoqXCAd945Im8beM=
=0aZ9
-----END PGP SIGNATURE-----

--Signature=_Fri__20_Jul_2007_01_44_32_+1000_V5Qr=U+x7I=h8zRn--