From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LylHP-0004nk-4n for qemu-devel@nongnu.org; Tue, 28 Apr 2009 07:15:15 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LylHK-0004lu-As for qemu-devel@nongnu.org; Tue, 28 Apr 2009 07:15:14 -0400 Received: from [199.232.76.173] (port=49841 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LylHK-0004lp-4u for qemu-devel@nongnu.org; Tue, 28 Apr 2009 07:15:10 -0400 Received: from smtp6-g21.free.fr ([212.27.42.6]:55253) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LylHJ-0003EL-8F for qemu-devel@nongnu.org; Tue, 28 Apr 2009 07:15:09 -0400 In-Reply-To: <49F6DEFB.9090106@siemens.com> Subject: Re: [Qemu-devel] Re: updating git tree From: "=?utf-8?q?Fran=C3=A7ois?= Revol" Date: Tue, 28 Apr 2009 13:15:18 +0200 CEST Message-Id: <3339862193-BeMail@laptop> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jan Kiszka Cc: laurent.desnogues@gmail.com, kwolf@redhat.com, Christoph.Egger@amd.com, computers57@hotmail.com, qemu-devel@nongnu.org > >>>> 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=3F 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. > > It still lacks the flexibility and consistency of stgit-managed > series > as it is designed around the original "rebase" step. With stgit, you > are > permanently in "rebase -i" mode, you can go back and forth =5Fwhile=5F > editing. You can switch branches without leaving the rebase mode. You > can also hide patches temporarily (how do you do this with rebase - > i=3F). > > However, in the end it is a question how you set up your personal > workflow. There are n ways to skin a cat. In the end it's a question of whether you have the time to read the doc and learn a new SCM or not. ATM... I do not. Fran=C3=A7ois.