From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Tue, 4 Sep 2012 14:45:11 +0200
Subject: [U-Boot] ARM Workflow: rebase on ARM repositories
In-Reply-To: <5045CBF0.7000901@denx.de>
References: <5044A44F.2050204@denx.de> <20120903200244.2ddad7d4@lilith>
	<5045CBF0.7000901@denx.de>
Message-ID: <20120904144511.62dd72c2@lilith>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Stefano,

On Tue, 04 Sep 2012 11:37:52 +0200, Stefano Babic <sbabic@denx.de>
wrote:

> > OTOH, we all can see Wolfgang sometimes performing pulls by merging,
> > so he might have a different view on this.
> 
> Of course ;-)

And so he has expressed, before your reply actually, and clearly
expressed a preference for merging rather than rebasing.

Next step - considering I've been the only one apparently to express
adissenting opinion - is thus to change the Denx Wiki documentation
about custodian trees so that it matches our policy.

> Regards,
> Stefano

Amicalement,
-- 
Albert.