From: Jay Soffian <jaysoffian@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git <git@vger.kernel.org>
Subject: Re: rebase vs rebase -i
Date: Thu, 4 Feb 2010 14:57:13 -0500 [thread overview]
Message-ID: <76718491002041157o37de139brb7995076274375aa@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.00.1002041946170.4505@intel-tinevez-2-302>
On Thu, Feb 4, 2010 at 1:46 PM, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> Both "rebase -i" and "rebase -m" are really a cherry-pick in a loop.
Well then I'm still confused. I see where pick_one() in
git-rebase--interactive.sh is using cherry-pick.
But call_merge() in git-rebase.sh is using git-merge-recursive (absent
specifying another strategy).
?
j.
next prev parent reply other threads:[~2010-02-04 19:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-04 4:19 rebase vs rebase -i Jay Soffian
2010-02-04 13:27 ` Johannes Schindelin
2010-02-04 17:14 ` Jay Soffian
2010-02-04 18:00 ` Johannes Schindelin
2010-02-04 18:10 ` Jay Soffian
2010-02-04 18:46 ` Johannes Schindelin
2010-02-04 19:57 ` Jay Soffian [this message]
2010-02-05 0:45 ` Junio C Hamano
2010-02-05 1:18 ` Junio C Hamano
2010-02-05 1:20 ` Jay Soffian
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=76718491002041157o37de139brb7995076274375aa@mail.gmail.com \
--to=jaysoffian@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/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).