Re: [Xen-devel] Is: git send-email, patch sending, etc Was: Re: [PATCH 1/4] IOMMU: allow MSI message to IRTE propagation to fail

[Wei Liu <wei.liu2@xxxxxxxxxx>]

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. ;-)


Wei.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel