From: Shawn O. Pearce Date: Mon, 10 Nov 2008 20:52:42 GMT Subject: Re: JGIT: discuss: diff/patch implementation Message-ID: <20081110205242.GH2932@spearce.org> In-Reply-To: <7v63mv5mro.fsf@gitster.siamese.dyndns.org> Junio C Hamano wrote: > Francis Galiegue 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.