From: Junio C Hamano Date: Mon, 10 Nov 2008 20:50:03 GMT Subject: Re: JGIT: discuss: diff/patch implementation Message-ID: <7v63mv5mro.fsf@gitster.siamese.dyndns.org> In-Reply-To: <200811101522.13558.fg@one2team.net> 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.