On Fri, Jun 30, 2023 at 07:16:19PM +0200, Stefano Brivio wrote:
> Thanks for the patch, and sorry for the delay!
> 
> First off, as I was mentioning on IRC: it would help to have this as
> two/three patches -- not just because it's easier to review, but also
> because the Makefile changes have, I guess, a relatively high risk of
> introducing some regressions, so keeping it simple for 'git bisect'
> would also be a plus here.
> 
> If you want to split this in your working tree, you can do something
> like:
> 
>   git reset HEAD~
> 
> meaning: reset (the git state, not the file contents) to the commit
> before head (~ is a shortcut for "just before"). Then 'git add' your
> pieces back -- and if you have two changes to the Makefile you want to
> keep separated, go with 'git add -i', which lets you add just parts.

git citool also allows doing this interactively quite nicely.  You can
move files, or individual hunks or lines between being in the commit,
or not.
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson