Re: Please pull ACPI updates

From: Andi Kleen
Date: Thu Jul 17 2008 - 16:14:30 EST


Linus Torvalds wrote:
> On Thu, 17 Jul 2008, Andi Kleen wrote:
>> The whole point of the exercise of cleaning up/rewriting the history is to make
>> the tree as bisectable as possible.
>
> No.
>
> "git bisect" is perfetly able to handle merges. They are _fine_.

The issue I worry about is it hitting between changes and their fixup.

e.g. for example if I find that specific change doesn't compile in some special
configuration then I amend it to fix that. Alternatively I could put in a fixup
commit afterwards, but then if someone did bisect and the bisect hit inbetween
the change and the fixup they might end up with a tree that doesn't compile.

-Andi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/