Re:Resistance against London tube map commit history (a.k.a....
by klyrs on Saturday May 04, 2024 @12:03PM
(#40258564)
Yeah, I have a love/hate relationship with squash. On one hand, I think everybody misses an autocommit hook once and a while and in Python its not uncommon to have "black" commits interspersed throughout it all. Love because it's convenient to squash all that noise with a single click; hate because I want a surgical squash where tooling/typo commits are automatically squashed into the parent.
[ Parent
| on HN ]
Re:Resistance against London tube map commit history (a.k.a....
by juped on Saturday May 04, 2024 @12:08PM
(#40258597)
commit --fixup=HEAD~1 (or any form of reference to the commit to fix up); rebase -i --autosquash later
my "reroll" alias is "reroll = rebase --interactive --keep-base --rebase-merges"; but the --rebase-merges is less useful to most people (I do maintainer operations as well, and it's sometimes useful there)
autosquash is on in the config, though i should really add it to the alias for redundancy, it's an alias and length doesn't matter.