From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] Pull request: u-boot-tegra/master
Date: Fri, 09 Dec 2011 18:53:36 +0100 [thread overview]
Message-ID: <4EE24B20.7070703@aribaud.net> (raw)
In-Reply-To: <4EE24751.9020900@nvidia.com>
Le 09/12/2011 18:37, Stephen Warren a ?crit :
>> Er... Rebase *does* 3-way merges when necessary and possible. I just saw
>> it done while pulling tegra, samsung and imx requests.
>
> I don't think that's possible; with rebase, there is no common ancestor,
> so you can't do a 3-way merge. The rebase conflicts end up being marked
> up in the conflicting files in a similar fashion to a 3-way merge
> though, but I think it's somewhat fake and just showing the differences
> between the base that was in the patch being applied and current code,
> which isn't quite the same thing.
Actually there is a common ancestor in a rebase just as in a merge --
the common ancestor is an attribute of (or more exactly a computation
based on) a set of commits, not of an operation. You'll find common
ancestors in a rebase operation mentioned in
<http://learn.github.com/p/rebasing.html>, for instance.
Amicalement,
--
Albert.
next prev parent reply other threads:[~2011-12-09 17:53 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-07 23:35 [U-Boot] Pull request: u-boot-tegra/master Tom Warren
2011-12-08 7:22 ` Albert ARIBAUD
2011-12-08 16:45 ` Stephen Warren
2011-12-09 15:36 ` Albert ARIBAUD
2011-12-09 17:10 ` Stephen Warren
2011-12-09 17:22 ` Albert ARIBAUD
2011-12-09 17:37 ` Stephen Warren
2011-12-09 17:53 ` Albert ARIBAUD [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-01-19 0:01 [U-Boot] pull " Tom Warren
2012-01-21 11:07 ` Albert ARIBAUD
2012-01-23 15:55 ` Tom Warren
2012-03-08 20:27 Tom Warren
2015-05-12 21:49 [U-Boot] Pull " Tom Warren
2015-05-13 1:45 ` Masahiro Yamada
2015-05-13 16:38 ` Tom Warren
2015-05-13 19:23 ` Tom Warren
2015-05-14 19:14 ` Tom Rini
2015-06-09 17:06 Tom Warren
2015-06-10 14:37 ` Tom Rini
2015-07-28 15:31 Tom Warren
2015-07-28 15:51 ` Stephen Warren
2015-07-28 17:23 ` Tom Warren
2015-08-06 20:39 [U-Boot] Pull request, u-boot-tegra/master Tom Warren
2015-08-11 17:44 ` Tom Warren
2015-08-11 18:04 ` Tom Rini
2015-08-11 20:54 ` Tom Warren
2015-08-13 20:26 Tom Warren
2015-08-13 21:55 ` Tom Rini
2015-09-16 23:27 Tom Warren
2015-09-17 1:06 ` Tom Rini
2015-10-02 18:15 Tom Warren
2015-10-03 0:51 ` Tom Rini
2015-11-12 20:53 Tom Warren
2015-11-13 1:26 ` Tom Rini
2016-01-28 17:46 Tom Warren
2016-01-28 23:18 ` Tom Rini
2016-02-18 19:53 Tom Warren
2016-02-20 0:54 ` Tom Rini
2016-03-29 17:24 Tom Warren
2016-03-29 22:06 ` Tom Rini
2016-05-04 21:36 Tom Warren
2016-05-04 22:12 ` Tom Rini
2016-06-03 16:00 Tom Warren
2016-06-06 11:15 ` Tom Rini
2016-07-06 17:32 Tom Warren
2016-07-08 2:51 ` Tom Rini
2016-07-21 20:17 Tom Warren
2016-07-23 0:10 ` Tom Rini
2016-07-23 0:17 ` Stephen Warren
2016-07-23 0:22 ` Tom Rini
2016-07-23 0:31 ` Stephen Warren
2016-07-23 0:42 ` Tom Rini
2016-08-05 17:26 Tom Warren
2016-08-06 0:57 ` Tom Rini
2016-08-15 19:38 Tom Warren
2016-08-16 1:09 ` Tom Rini
2016-08-25 23:42 Tom Warren
2016-08-26 14:52 ` Tom Rini
2016-09-01 17:32 Tom Warren
2016-09-02 14:53 ` Tom Rini
2016-09-27 16:16 Tom Warren
2016-09-27 21:34 ` Tom Rini
2016-10-10 20:55 Tom Warren
2016-10-13 0:48 ` Tom Rini
2016-11-08 15:34 Tom Warren
2016-11-08 20:53 ` Tom Rini
2017-01-04 17:05 Tom Warren
2017-01-05 13:28 ` Tom Rini
2017-04-04 17:56 Tom Warren
2017-04-05 1:13 ` Tom Rini
2017-06-12 23:32 Tom Warren
2017-06-15 13:01 ` Tom Rini
2017-06-20 19:04 Tom Warren
2017-06-21 23:05 ` Tom Rini
2017-08-16 15:30 Tom Warren
2017-08-17 1:17 ` Tom Rini
2018-01-12 17:37 Tom Warren
2018-01-15 13:53 ` Tom Rini
2018-01-16 17:47 ` Stephen Warren
2018-01-16 18:14 ` Tom Rini
2018-05-11 19:19 Tom Warren
2018-05-12 1:49 ` Tom Rini
2018-07-06 20:11 Tom Warren
2018-07-06 22:04 ` Tom Rini
2018-07-26 21:08 Tom Warren
2018-07-27 17:08 ` Tom Rini
2018-08-21 17:27 Tom Warren
2018-08-23 13:59 ` Tom Rini
2019-02-19 22:44 Tom Warren
2019-02-20 16:34 Tom Warren
2019-02-21 23:10 ` Tom Rini
2019-05-28 16:01 Tom Warren
2019-05-29 17:18 ` Tom Rini
2019-06-05 20:50 Tom Warren
2019-06-07 1:31 ` Tom Rini
2019-06-07 15:28 ` Tom Warren
2019-06-07 15:40 ` Tom Rini
2019-06-07 17:17 ` Tom Warren
2019-06-07 18:30 ` Peter Robinson
2019-06-11 1:31 ` Tom Rini
2019-08-09 17:21 Tom Warren
2019-08-11 1:13 ` Tom Rini
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=4EE24B20.7070703@aribaud.net \
--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.