From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Francis Galiegue <fg@one2team.net>,
Git Mailing List <git@vger.kernel.org>,
Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Subject: Re: JGIT: discuss: diff/patch implementation
Date: Mon, 10 Nov 2008 12:52:42 -0800 [thread overview]
Message-ID: <20081110205242.GH2932@spearce.org> (raw)
In-Reply-To: <7v63mv5mro.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> wrote:
> Francis Galiegue <fg@one2team.net> writes:
>
> > A very nice git feature, without even going as far as merges, is the cherry
> > pick feature.
>
> I thought cherry-picking needs to be done in terms of 3-way merge, not
> diff piped to patch, for correctness's sake.
Yea, the 3-way merge cherry-pick is better. But in a pinch you
can (usually) get correct results from a "diff | patch" pipeline.
Of course that doesn't always work, resulting in patches that don't
apply cleanly, or worse, that apply at the wrong place silently.
--
Shawn.
next prev parent reply other threads:[~2008-11-10 20:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-10 14:22 JGIT: discuss: diff/patch implementation Francis Galiegue
2008-11-10 15:56 ` Robin Rosenberg
2008-11-10 16:16 ` Francis Galiegue
2008-11-10 16:59 ` Robin Rosenberg
2008-11-10 18:11 ` Francis Galiegue
2008-11-10 19:46 ` Johannes Schindelin
2008-11-10 20:21 ` Francis Galiegue
2008-11-10 20:50 ` Junio C Hamano
2008-11-10 20:52 ` Shawn O. Pearce [this message]
2008-11-10 21:31 ` Francis Galiegue
2008-11-10 23:37 ` Johannes Schindelin
2008-11-11 10:06 ` Raimund Bauer
2008-11-11 17:18 ` Shawn O. Pearce
2008-11-11 17:31 ` Sverre Rabbelier
2008-11-11 7:27 ` Rogan Dawes
2008-11-11 17:13 ` Shawn O. Pearce
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=20081110205242.GH2932@spearce.org \
--to=spearce@spearce.org \
--cc=fg@one2team.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=robin.rosenberg.lists@dewire.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 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.