Julian Berman

Here's 3 #git operations that don't exist / aren't completely trivial (== < 60 seconds) to script. I'm posting them so you all can tell me they do exist so I don't have to spend longer :)

1) discard all whitespace changes in the working tree, preserving all other changes
2) reorder the `git stash` entries without manual popping / pushing
3) given N branches, fast forward all of them so that they all end up at the same combined HEAD with changes from all N branches on it

#CunninghamsLaw

Oct 1, 2024 at 9:35pmWeb
Show threadHenry Bley-VromanOct 3, 2024
@JulianWasTaken not sure I understand the third. Maybe you're looking for "octopus merge"?
Show threadJulian BermanOct 6, 2024
@olets I have to draw a git diagram probably to be clear (and remind myself if I know precisely which case octopus merges solve), but I *think* they leave you with your HEAD branch containing all the commits from the N octopus branches, right?
Here, I want *all* branches to be at that point, either via N mutual octupus merges one on each of the N branches, or else ideally fast forward everything and then fall back to merges if need be.