From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andi Kleen Subject: Re: Please pull ACPI updates Date: Thu, 17 Jul 2008 22:14:14 +0200 Message-ID: <487FA816.6070208@firstfloor.org> References: <20080716214516.GA10777@basil.nowhere.org> <200807170011.12184.rjw@sisk.pl> <200807161633.01375.jbarnes@virtuousgeek.org> <487EEAEB.4050009@firstfloor.org> <487F71E8.9050705@firstfloor.org> <2c0942db0807171211s39e2653fwdc50f92d9c3020d2@mail.gmail.com> <487FA24B.9060803@firstfloor.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from one.firstfloor.org ([213.235.205.2]:33649 "EHLO one.firstfloor.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759781AbYGQUOS (ORCPT ); Thu, 17 Jul 2008 16:14:18 -0400 In-Reply-To: Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Linus Torvalds Cc: Ray Lee , Jesse Barnes , "Rafael J. Wysocki" , torvalds@linuxfoundation.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org 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