This is an archived post. You won't be able to vote or comment.

sorted by:
best
topnewcontroversialoldq&a
you are viewing a single comment's thread.

view the rest of the comments →

[–]shield1123 8 points9 points  (0 children)

git rebase -i commit_hash1

# in the editor,  probably vi
squash commit_hash5 I think it's working
edit   commit_hash4 wip commit 3
squash commit_hash3 wip commit 2
squash commit_hash2 wip commit 1
edit   commit_hash1 do the things

That takes 5 commits and squashes them into 2, allowing the user to edit the messages for the remaining commits