From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 07 Sep 2012 19:27:32 GMT
Subject: Re: help doing a hotfix bisect: cherry-pick -m ??
Message-ID: <7v627py6or.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAJfuBxwBn-WFw+nci1MpdWQvyXkrhyB3maXPwMAsxggTE3gz3Q@mail.gmail.com>

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.