From: Jim Cromie <jim.cromie@gmail.com>
Date: Fri, 07 Sep 2012 21:55:34 GMT
Subject: Re: help doing a hotfix bisect: cherry-pick -m ??
Message-ID: <CAJfuBxw4_VhyGENcgsBp0WohapAAmiqfEstWF-gjcnUestBwLw@mail.gmail.com>
In-Reply-To: <7v627py6or.fsf@alter.siamese.dyndns.org>

On Fri, Sep 7, 2012 at 1:27 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Jim Cromie <jim.cromie@gmail.com> writes:
>
>> Broader question:
>
>> Im thinking that having a hotfix branch, and merging --no-commit would
>> work better,
>> especially when bisection lands on a commit which already contains
>> some of those in the hotfix branch.
>
> When your history leading to the "bad" commit contains only part of
> the hot-fix branch and not all of it, that may work better.

good, I have a 1/2 grip at least. thank you.

any tips on how to use the -m option ?
Ive had no success passing small integers,
and I need to include the commits from the merged branch

The only alternative I have is to rework the split *_deferred patch
on top of the merge-point, and hope that it tests ok with the original
hotfix patch,
then I can probably do the bisect.