From mboxrd@z Thu Jan  1 00:00:00 1970
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: Re: Is: git send-email, patch sending,
 etc Was: Re: [PATCH 1/4] IOMMU: allow MSI message to IRTE
 propagation to fail
Date: Tue, 7 May 2013 10:03:07 -0400
Message-ID: <20130507140307.GB414@phenom.dumpdata.com>
References: <51516FA502000078000C86E1@nat28.tlf.novell.com>
	<5151725B02000078000C86F5@nat28.tlf.novell.com>
	<CAFLBxZb-fDyyqFTY6DfpLbWxp+KsARyOgzMVRcBQNgz0mw-VnA@mail.gmail.com>
	<5152F14902000078000C8DAE@nat28.tlf.novell.com>
	<51530874.1030902@eu.citrix.com>
	<51540C8702000078000C91D7@nat28.tlf.novell.com>
	<51541C87.4020709@eu.citrix.com>
	<5154340D02000078000C9345@nat28.tlf.novell.com>
	<20130506202504.GA23361@phenom.dumpdata.com>
	<20130507092650.GA12717@zion.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Content-Disposition: inline
In-Reply-To: <20130507092650.GA12717@zion.uk.xensource.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Wei Liu <wei.liu2@citrix.com>
Cc: Jan Beulich <JBeulich@suse.com>, George Dunlap <George.Dunlap@eu.citrix.com>, Jacob Shin <jacob.shin@amd.com>, xen-devel <xen-devel@lists.xen.org>, Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>, Xiantao Zhang <xiantao.zhang@intel.com>
List-Id: xen-devel@lists.xenproject.org

On Tue, May 07, 2013 at 10:26:50AM +0100, Wei Liu wrote:
> On Mon, May 06, 2013 at 09:25:04PM +0100, Konrad Rzeszutek Wilk wrote:
> [...]
> > 
> > If at some point I realized I screwed up or was more happy with
> > the patches I would do '!git rebase -i HEAD^^^^^^' (the ^ is the
> > amount of patches back I want to go) and either redo the commits
> > or alter some of the patches. Sometimes that also meant split
> > a patch in two which requires hitting the shell right before
> > the offending git commit (so when you do git rebase -i <something>
> > you can then choose to hit the shell before a patch), then in the
> > shell do  bit more of 'git show <the offending git commit>  /tmp/a',
> > 'cp /tmp/a /tmp/orig', then editing /tmp/a for the non-offending bits,
> > patch -p1 -R < /tmp/a, git add <files>, git commit , and then
> > contiuning with the original patch that will now have a conflict
> > (as the git rebase will try apply it).
> > 
> 
> Re spliting commit, you can do 'git rebase', stopping at the targeted
> commit as HEAD, then do 'git reset HEAD^' (no '--hard' option), which
> will turn your commit into local change. Then 'git add <FILE> -p' should
> do the job most of the time.
> 
> This method seems require less keystrokes and not having to deal with
> conflict. ;-)

That is much easier. Thanks!
> 
> 
> Wei.
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
>