public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Stefano Babic <sbabic@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [STATUS] Heads-up: Reorganize directory structure
Date: Tue, 13 Apr 2010 19:28:36 +0200	[thread overview]
Message-ID: <4BC4A9C4.7080901@denx.de> (raw)
In-Reply-To: <4BC4A09D.20201@gmail.com>

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
=====================================================================

  reply	other threads:[~2010-04-13 17:28 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-13  9:23 [U-Boot] [STATUS] Heads-up: Reorganize directory structure Wolfgang Denk
2010-04-13 16:49 ` Ben Warren
2010-04-13 17:28   ` Stefano Babic [this message]
2010-04-13 17:29     ` Ben Warren
2010-04-13 19:24       ` Wolfgang Denk
2010-04-13 20:32         ` Remy Bohmer
2010-04-13 21:01           ` Wolfgang Denk
2010-04-13 19:22   ` Wolfgang Denk
2010-04-13 18:55 ` Remy Bohmer
2010-04-13 19:47 ` Jerry Van baren
2010-04-15  7:05 ` Michal Simek
2010-04-15  7:52   ` Wolfgang Denk
2010-04-15 15:04     ` Peter Tyser
2010-04-15 15:22       ` Wolfgang Denk
2010-04-15 15:31         ` Alessandro Rubini
2010-04-15 15:58           ` Peter Tyser
2010-04-15 17:58             ` Alessandro Rubini
2010-04-15 22:44               ` Peter Tyser
2010-04-16  2:42             ` Graeme Russ
2010-04-16  6:58               ` Alessandro Rubini
2010-04-16  7:50                 ` Wolfgang Denk
2010-04-16  7:41               ` Wolfgang Denk
2010-04-16 11:45                 ` Graeme Russ
2010-04-16 13:23                   ` Wolfgang Denk
2010-04-15 23:14           ` Wolfgang Denk
2010-04-17  8:25 ` Graeme Russ

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4BC4A9C4.7080901@denx.de \
    --to=sbabic@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox