From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760766AbXKTQX1 (ORCPT ); Tue, 20 Nov 2007 11:23:27 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758551AbXKTQXS (ORCPT ); Tue, 20 Nov 2007 11:23:18 -0500 Received: from out1.smtp.messagingengine.com ([66.111.4.25]:57977 "EHLO out1.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757933AbXKTQXQ (ORCPT ); Tue, 20 Nov 2007 11:23:16 -0500 X-Sasl-enc: W+ndk8v4CRHFzxmHGbyLfz3g1WmO1SsHbKgjyjmYmmKr 1195575795 Date: Tue, 20 Nov 2007 14:23:12 -0200 From: Henrique de Moraes Holschuh To: Alex Chiang , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Subject: stgit (was Re: [PATCH 4/4, v4] ACPI, PCI: ACPI PCI slot detection driver) Message-ID: <20071120162312.GE4654@khazad-dum.debian.net> References: <20071117182954.GA25003@ldl.fc.hp.com> <20071117183818.GD26452@ldl.fc.hp.com> <20071119220418.GE32540@ldl.fc.hp.com> <20071119142631.4aa650eb@appleyard> <20071120030738.GA15633@ldl.fc.hp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20071120030738.GA15633@ldl.fc.hp.com> X-GPG-Fingerprint: 1024D/1CDB0FE3 5422 5C61 F6B7 06FB 7E04 3738 EE25 DE3F 1CDB 0FE3 User-Agent: Mutt/1.5.16 (2007-06-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 19 Nov 2007, Alex Chiang wrote: > Ugh, seems that stacked git got very confused when I did a > git-fetch && git-rebase origin. Also, guess it figures that I Being a very heavy stgit user myself, I have to say you must give up git rebase on any stgit branch, and use stg rebase instead... otherwise, bad things can, and do happen. Also, don't trust the stgit release schedule, it is "release eventually" and not something more sensible, like "release often". Instead, track the stgit git tree. I wish git learned to do the basic stgit's business by itself :( -- "One disk to rule them all, One disk to find them. One disk to bring them all and in the darkness grind them. In the Land of Redmond where the shadows lie." -- The Silicon Valley Tarot Henrique Holschuh