All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Francis Galiegue <fg@one2team.net>
Cc: Git Mailing List <git@vger.kernel.org>,
	"Shawn O. Pearce" <spearce@spearce.org>,
	Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Subject: Re: JGIT: discuss: diff/patch implementation
Date: Mon, 10 Nov 2008 12:50:03 -0800	[thread overview]
Message-ID: <7v63mv5mro.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <200811101522.13558.fg@one2team.net> (Francis Galiegue's message of "Mon, 10 Nov 2008 15:22:13 +0100")

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.

  parent reply	other threads:[~2008-11-10 20:51 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 [this message]
2008-11-10 20:52   ` Shawn O. Pearce
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=7v63mv5mro.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=fg@one2team.net \
    --cc=git@vger.kernel.org \
    --cc=robin.rosenberg.lists@dewire.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. 
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.