From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 01 Apr 2015 17:03:52 GMT
Subject: Re: [PATCH] docs: Clarify what git-rebase's "--preserve-merges" does
Message-ID: <xmqqpp7nn5l3.fsf@gitster.dls.corp.google.com>
In-Reply-To: <87vbhgks0v.fsf@javad.com>

Sergey Organov <s.organov@javad.com> writes:

> Nope. It seems like cherry-pick takes care of that:
> ...
> What do I miss?

The fact that cherry-pick did not flag it as a potential conflict
situation where a manual verification is required (the cherry-pick
process can be fooled by textual similarity and either add the same
thing twice or fail to add one thing that is needed).