From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 37010910 for ; Fri, 29 Jul 2016 17:57:29 +0000 (UTC) Received: from bedivere.hansenpartnership.com (bedivere.hansenpartnership.com [66.63.167.143]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 92EB7181 for ; Fri, 29 Jul 2016 17:57:28 +0000 (UTC) Message-ID: <1469815046.2330.13.camel@HansenPartnership.com> From: James Bottomley To: "Bird, Timothy" , Christoph Lameter , David Howells Date: Fri, 29 Jul 2016 10:57:26 -0700 In-Reply-To: References: <20160729131151.GF4340@x> <20160729075039.GA26402@x> <30809.1469794812@warthog.procyon.org.uk> <1596.1469801212@warthog.procyon.org.uk> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Cc: "ksummit-discuss@lists.linuxfoundation.org" Subject: Re: [Ksummit-discuss] [ANNOUNCE] git-series: track changes to a patch series over time List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Fri, 2016-07-29 at 17:52 +0000, Bird, Timothy wrote: > > > -----Original Message----- > > From: ksummit-discuss-bounces@lists.linuxfoundation.org [mailto:ksu > > mmit- > > discuss-bounces@lists.linuxfoundation.org] On Behalf Of Christoph > > Lameter > > Sent: Friday, July 29, 2016 7:21 AM > > To: David Howells > > Cc: ksummit-discuss@lists.linuxfoundation.org > > Subject: Re: [Ksummit-discuss] [ANNOUNCE] git-series: track changes > > to a patch > > series over time > > > > On Fri, 29 Jul 2016, David Howells wrote: > > > > > Josh Triplett wrote: > > > > > > > Note that git-series doesn't provide a quilt-style push/pop > > > > workflow, > > > > with applied and unapplied patches; it just looks at HEAD. > > > > > > Ah... In that case it's probably not a sufficient substitute for > > > how I use > > > stgit. > > > > Did not know that there was stgit. Still stuck on quilt since > > I like editing the files directly (its often easier to edit the > > diffs if > > you want to rename things etc). > > > > Interesting projects. > > Indeed. For many years I used a quilt-based workflow. Recently > I've been trying to convert to a pure git-based workflow, but for > some reason git rebase -I always seems to give me problems. It > always takes me much longer to just move some hunk from one > commit to another than it did in quilt using the patches and vi. I do this too, but I also work with the diff when moving hunks. What I do is: git checkout git show > tmp.diff vi tmp.diff so it only has the hunks I want to remove patch -p1 -R < ~/tmp.diff git commit --amend -a git checkout patch -p1 < ~/tmp.diff git commit --amend -a It's a bit cumbersome, but you can script it. If there are better ways to do it, I'm interested. James