On Fri, Sep 7, 2012 at 1:27 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jim Cromie <jim.cro...@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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
