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 3A9912C for ; Sat, 30 Jul 2016 03:02:57 +0000 (UTC) Received: from smtprelay.hostedemail.com (smtprelay0094.hostedemail.com [216.40.44.94]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id B3991AF for ; Sat, 30 Jul 2016 03:02:56 +0000 (UTC) Received: from smtprelay.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by smtpgrave05.hostedemail.com (Postfix) with ESMTP id B236F1844CB for ; Sat, 30 Jul 2016 02:55:05 +0000 (UTC) Date: Fri, 29 Jul 2016 22:55:01 -0400 From: Steven Rostedt To: James Bottomley Message-ID: <20160729225501.607e2ae9@grimm.local.home> In-Reply-To: <1469815046.2330.13.camel@HansenPartnership.com> References: <20160729131151.GF4340@x> <20160729075039.GA26402@x> <30809.1469794812@warthog.procyon.org.uk> <1596.1469801212@warthog.procyon.org.uk> <1469815046.2330.13.camel@HansenPartnership.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: Christoph Lameter , "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, 29 Jul 2016 10:57:26 -0700 James Bottomley wrote: > 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. I do that quite a lot too. But I also use a git quilt mix a bit. When I get a patch that is based on my work and fails to apply, I do: quilt import /tmp/ftrace.patch quilt push -f see what breaks, and fix it up. Sometimes I have to go and change the change log, or subject, especially if the patch is from a non native English speaker, and the change log simply doesn't make much sense (unless you know what the patch is already doing). Then: quilt refresh do-git-am.pl patches/ftrace.patch Where do-git-am.pl is my script that will add Cc's and Link: tags. -- Steve