Junio C Hamano <gitster@xxxxxxxxx> wrote: > Francis Galiegue <fg@xxxxxxxxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
