emacs

Drew Verlee 2025-01-15T05:20:19.730059Z

Is there a magit command that will squash all the commits in a branch into one commit? I can do this rebase and interactive but maybe there is a faster way. Also i still don't quite understand what autosquash is supposed to do. LIke i have read the description but maybe im missing the use case where it would make sense to do it over using interactive.

Drew Verlee 2025-01-15T16:03:52.712699Z

ah, right, that makes sense. thanks @alexyakushev

aisamu 2025-01-20T16:29:28.751099Z

autosquash "executes" the rebase log, combining all !fixup and !squash commits into their respective counterparts. A fixup! will leave the original commit message untouched.

👍 1
oyakushev 2025-01-15T07:21:12.721479Z

You can soft-reset the branch to the commit of choice and then commit everything as one commit. Just be carefull to re-add new files.

💯 1
✍️ 4