From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LykZV-0004RI-CM
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 06:29:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LykZP-0004QJ-Iu
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 06:29:51 -0400
Received: from [199.232.76.173] (port=45185 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LykZP-0004QF-8j
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 06:29:47 -0400
Received: from mx2.redhat.com ([66.187.237.31]:47016)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <kwolf@redhat.com>) id 1LykZO-00057b-OD
	for qemu-devel@nongnu.org; Tue, 28 Apr 2009 06:29:47 -0400
Message-ID: <49F6DA48.4070000@redhat.com>
Date: Tue, 28 Apr 2009 12:28:24 +0200
From: Kevin Wolf <kwolf@redhat.com>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] Re: updating git tree
References: <BAY110-DAV15DFE0635DCC2980E8842B96E0@phx.gbl>	<761ea48b0904272354w3267b367hb62ee873b5e50a29@mail.gmail.com>	<200904281049.54617.Christoph.Egger@amd.com>
	<49F6CE81.7040809@siemens.com> <49F6D493.9050806@redhat.com>
	<49F6D880.1060409@siemens.com>
In-Reply-To: <49F6D880.1060409@siemens.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Laurent Desnogues <laurent.desnogues@gmail.com>, Christoph Egger <Christoph.Egger@amd.com>, "C.W. Betts" <computers57@hotmail.com>, qemu-devel@nongnu.org

Jan Kiszka schrieb:
> Kevin Wolf wrote:
>> Jan Kiszka schrieb:
>>> If you have non-trivial changes pending, probably in multiple commits, I
>>> can only recommend using stgit (or guilt) to compensate the missing
>>> patch queue feature of git. It allows you to easily navigate back and
>>> forth in your patch queues before finally posting them.
>> I haven't used these yet. Is there a real benefit compared to using a
>> normal git branch and rebase -i? Maybe I should try them if so.
> 
> I'm not only talking about rebasing, also about working within your
> patch queue, editing patches in their middle, splitting it up,
> reordering it etc. There are surely ways to do this with native git
> (stgit is just a front-end and uses normal git), but that's not done
> with two or three git commands.

This is why I said rebase -i and not only rebase. In case you don't know
this yet: It presents you a list of all commits you did since the point
you're rebasing on. You can then drop, merge, edit (which includes
splitting, see the man page of git-rebase) and change the order of them.

Kevin