From: Junio C Hamano <gitster@pobox.com>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Mark Levedahl <mlevedahl@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: rename detection limit checking, cherry picking, and git am -3
Date: Sun, 16 Sep 2007 21:27:46 -0700 [thread overview]
Message-ID: <7v3axd5325.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20070917034742.GG3099@spearce.org> (Shawn O. Pearce's message of "Sun, 16 Sep 2007 23:47:42 -0400")
"Shawn O. Pearce" <spearce@spearce.org> writes:
> I actually don't see why cherry-pick can't be defined in terms
> of `format-patch|am -3`. It probably would be faster in almost
> all cases.
Heh, people often suggested that rebase should get --merge as
default, and I resisted that.
I think it would make sense to do the consolidated backend for
rebase, revert, cherry-pick and am (I have been tentatively
calling this "git replay") primarily based on the "patch with
fallback to 3-way" like format-patch piped to "am -3", with an
option to do merge-recursive.
next prev parent reply other threads:[~2007-09-17 4:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-17 3:32 rename detection limit checking, cherry picking, and git am -3 Mark Levedahl
2007-09-17 3:47 ` Shawn O. Pearce
2007-09-17 4:27 ` Junio C Hamano [this message]
2007-09-17 9:58 ` Karl Hasselström
2007-09-18 0:18 ` Mark Levedahl
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v3axd5325.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mlevedahl@gmail.com \
--cc=spearce@spearce.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).