From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Tue, 13 Apr 2010 19:28:36 +0200 Subject: [U-Boot] [STATUS] Heads-up: Reorganize directory structure In-Reply-To: <4BC4A09D.20201@gmail.com> References: <20100413092323.44D8719F60@gemini.denx.de> <4BC4A09D.20201@gmail.com> Message-ID: <4BC4A9C4.7080901@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================