All of lore.kernel.org
 help / color / mirror / Atom feed
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] ARM Workflow: rebase on ARM repositories
Date: Tue, 4 Sep 2012 14:45:11 +0200	[thread overview]
Message-ID: <20120904144511.62dd72c2@lilith> (raw)
In-Reply-To: <5045CBF0.7000901@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.

  reply	other threads:[~2012-09-04 12:45 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-03 12:36 [U-Boot] ARM Workflow: rebase on ARM repositories Stefano Babic
2012-09-03 13:13 ` Stefan Roese
2012-09-03 14:15   ` Stefano Babic
2012-09-03 18:02 ` Albert ARIBAUD
2012-09-03 19:13   ` Wolfgang Denk
2012-09-03 19:47     ` Albert ARIBAUD
2012-09-03 20:52       ` Wolfgang Denk
2012-09-04  9:37   ` Stefano Babic
2012-09-04 12:45     ` Albert ARIBAUD [this message]
2012-09-04 15:32     ` Stephen Warren
2012-09-03 19:06 ` Wolfgang Denk

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=20120904144511.62dd72c2@lilith \
    --to=albert.u.boot@aribaud.net \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.