From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <boutcher@cs.umn.edu>
Received: from mail.cs.umn.edu (mail.cs.umn.edu [128.101.36.202])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "mail.cs.umn.edu",
	Issuer "Thawte Premium Server CA" (verified OK))
	by ozlabs.org (Postfix) with ESMTP id 5F45667A77
	for <linuxppc-dev@ozlabs.org>; Sat, 24 Jun 2006 03:54:51 +1000 (EST)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Message-ID: <17564.6980.694265.974713@hound.rchland.ibm.com>
Date: Fri, 23 Jun 2006 11:48:04 -0500
To: Paul Mackerras <paulus@samba.org>
Subject: "merge" branch reset in powerpc.git tree
In-Reply-To: <17563.54330.600099.894958@cargo.ozlabs.ibm.com>
References: <17563.54330.600099.894958@cargo.ozlabs.ibm.com>
From: boutcher@cs.umn.edu (Dave C Boutcher)
Cc: linuxppc-dev@ozlabs.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, 23 Jun 2006 21:44:58 +1000, Paul Mackerras <paulus@samba.org> said:
> 
> If you are following the powerpc.git tree, and you pull the "merge"
> branch, you will need to reset it to have commit ID
> 5fa21d821f6972e70942f2c555ec29dde962bdb2 as its head.  That's also the
> head of the "master" branch and of Linus' linux-2.6 tree at the
> moment.

At risk of appearing like a git ignoramous...could you post the
command to perform such a reset?

Thanks

Dave B