On 07/07/2026 15:09, Andrew Bailey wrote:
Hi Luca,
I thought that I did this previously but tried again just to make
sure, referring to "git mv". The commit is clean when I change the name
of the files but when I squash my commit that actually changes the
contents of the files it makes the overview incredibly messy as before.
I tried doing the moves and changes in different commits and
squashing them, as well as just doing them in all one commit with the
same result. I did not submit two separate patches because then the
first commit alone would break doc builds. Is there something else you
would like me to try in order to make this cleaner?
Mmmmh, that's rather odd. You can try to reset two commits. So if your
worktree has the 2 commits (before squashing) do:
git reset --soft HEAD~2
This should keep all the changes of the two commits uncommitted. And
then you can fix the renaming here and then do a final commit.
Otherwise... if nothing else works, will accept v4.
Luca
