Re: [Ksummit-discuss] [ANNOUNCE] git-series: track changes to a patch series over time

[Josh Triplett <josh@joshtriplett.org>]

On Fri, Jul 29, 2016 at 09:13:58PM +0100, David Howells wrote:
> James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
> 
> > I do this too, but I also work with the diff when moving hunks.  What I
> > do is:
> > 
> > git checkout <removal commit>
> > git show <removal commit> > 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 <add commit>
> > 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.
> 
> One of the reasons I use stgit is when it comes to excising changes into a
> separate patch, it makes it a lot easier:
> 
> 	 stg show >tmp.diff	# Export contents of current patch
> 	 emacs tmp.diff		# Edit so it only has the hunks I want to remove
> 	 stg pop		# Pop the patch I want to remove part of
> 	 stg new foo		# Create a new patch
> 	 stg fold tmp.diff	# ... and apply the patch created above
> 	 emacs ...		# Fix up any bits
> 	 stg refresh		# ... and make a commit out of it
> 	 stg push		# Push the patch I wanted to remove from

Typically, I'd do the same thing by using `git rebase -i` (or `git
series rebase -i`), marking the patch I want to split as 'e' for edit to
stop with that patch on top of the stack, resetting it, and using add -p
and committing bits incrementally into multiple commits.  (I can grab
bits of the commit message from ORIG_HEAD as needed.)

- Josh Triplett