Skip to content

Comment on Resistance Against Git Merge Hell (2015)parent

Comments

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.

AboutSource Built by g1lg1l

Hackerly is an independent reader for Hacker News, built on the public HN API. Not affiliated with Y Combinator.