From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ben Warren <biggerbadderben@gmail.com>
Date: Tue, 13 Apr 2010 10:29:44 -0700
Subject: [U-Boot] [STATUS] Heads-up: Reorganize directory structure
In-Reply-To: <4BC4A9C4.7080901@denx.de>
References: <20100413092323.44D8719F60@gemini.denx.de>
	<4BC4A09D.20201@gmail.com> <4BC4A9C4.7080901@denx.de>
Message-ID: <4BC4AA08.1060608@gmail.com>
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 4/13/2010 10:28 AM, Stefano Babic wrote:
> Ben Warren wrote:
>    
>> Hi Wolfgang,
>>
>> On 4/13/2010 2:23 AM, Wolfgang Denk wrote:
>>      
>>> Hello Custodians,
>>>
>>> please note that I have applied Peter Tyser's "Reorganize directory
>>> structure" patch series. This results in a massive change of the
>>> directory structure.
>>>
>>> Please make sure to sync your repsitories ASAP.
>>>
>>>
>>>        
>> Please excuse my ignorance, but what's the best way to do this?
>> git-merge with the main branch?
>>      
> Hi Ben,
>
> I do not know if there is a preferred or best way to do it, but in my
> case a simple git-rebase with the main branch did the job ;).
>
> Stefano
>
>    
Thanks.  I guess git-rebase would be better since that will put my net 
repo changes at the top.

regards,
Ben