From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <Geert.Uytterhoeven@sonycom.com>
Received: from vervifontaine.sonycom.com (unknown [80.88.33.193])
	by ozlabs.org (Postfix) with ESMTP id C749067B5F
	for <linuxppc-dev@ozlabs.org>; Tue,  5 Dec 2006 21:58:57 +1100 (EST)
Date: Tue, 5 Dec 2006 11:58:45 +0100 (CET)
From: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Sender: geert@sonytel.be
To: Sylvain Munaut <tnt@246tNt.com>
Subject: Re: master branch reset
In-Reply-To: <4575463F.6070902@246tNt.com>
Message-ID: <Pine.LNX.4.62.0612051157200.21116@pademelon.sonytel.be>
References: <17780.2568.641734.276805@cargo.ozlabs.ibm.com>
	<Pine.LNX.4.62.0612050839120.12448@pademelon.sonytel.be>
	<528646bc0612042349t34662037nc641c8e6e2516a09@mail.gmail.com>
	<Pine.LNX.4.62.0612050901160.12448@pademelon.sonytel.be>
	<528646bc0612050015xa18b33bh4afdc2f9d196f1a1@mail.gmail.com>
	<Pine.LNX.4.62.0612051022470.20543@pademelon.sonytel.be>
	<4575463F.6070902@246tNt.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
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 Tue, 5 Dec 2006, Sylvain Munaut wrote:
> try git pull -f -v

Thanks, that worked!

But as I already started recloning and the old tree had some conflicts after
the pull -f, I just switched to the new clone.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- Sony Network and Software Technology Center Europe (NSCE)
Geert.Uytterhoeven@sonycom.com ------- The Corporate Village, Da Vincilaan 7-D1
Voice +32-2-7008453 Fax +32-2-7008622 ---------------- B-1935 Zaventem, Belgium