Linus Torvalds <[EMAIL PROTECTED]> writes:
> On Mon, 29 Aug 2005, Junio C Hamano wrote:
>> I, however, am not 100% convinced --ignore-applied is too
>> dangerous to be useful in any conceivable use cases, at least
>> not yet. For example, you might be cherry-picking a change from
>> a foreign branch with 'git-diff-tree -p other~45 | git apply',
>> where the current branch may have already aquired part of the
>> changes that foreign branch contains since 45 generations ago.
> .. and that's why we use a three-way merge, and not diffs, to merge two
.. and that's why I recently rewrote revert, cherry-pick and
rebase to use three-way merge as well ;-).
The code is simple enough and I see some beauty in it, but I
honor your veto, at least for now.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html