From: Thomas Rast <trast@student.ethz.ch>
To: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Cc: Sverre Rabbelier <srabbelier@gmail.com>, <git@vger.kernel.org>,
<gitster@pobox.com>
Subject: Re: [PATCH v2] rebase -X: do not clobber strategy
Date: Thu, 11 Nov 2010 11:41:33 +0100 [thread overview]
Message-ID: <201011111141.33623.trast@student.ethz.ch> (raw)
In-Reply-To: <AANLkTiks87caBYo78Xh1hwnEfDF9yKwBn5q3wa87hBo3@mail.gmail.com>
Martin von Zweigbergk wrote:
> Btw, why is the default (if no strategy is specifed) for 'git rebase' to
> use 'recursive', while for 'git merge' "a built-in list of strategies is
> used instead (git merge-recursive when merging a single head, git
> merge-octopus otherwise)"?
Because rebase does a tree-level merge, so it never attempts to merge
than one branch, so octopus never enters the picture.
Sorry for the original breakage; while it has Mike Lundy assigned as
author, I resurrected and resubmitted his patch and should have
noticed.
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2010-11-11 10:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-10 7:14 [PATCH v2] rebase -X: do not clobber strategy Martin von Zweigbergk
2010-11-10 18:56 ` Sverre Rabbelier
2010-11-11 1:11 ` Martin von Zweigbergk
2010-11-11 10:41 ` Thomas Rast [this message]
2010-11-11 12:59 ` Martin von Zweigbergk
2010-11-11 22:01 ` Junio C Hamano
2010-11-12 1:31 ` Martin von Zweigbergk
2010-11-12 20:55 ` Junio C Hamano
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=201011111141.33623.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.von.zweigbergk@gmail.com \
--cc=srabbelier@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).