I normally would use git rebase --interactive HEAD~{x} and squash things from there. It easier for me and I make fewer mistakes with it.
git rebase --interactive HEAD~{x}
I use interactive rebase too, I think it's the easiest to reorder commits, merge similar ones, etc.
I wrote an article about, among other things, interactive rebase: adopteungit.fr/en/methodology/2017...
I will try this out.
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
I normally would use
git rebase --interactive HEAD~{x}and squash things from there. It easier for me and I make fewer mistakes with it.I use interactive rebase too, I think it's the easiest to reorder commits, merge similar ones, etc.
I wrote an article about, among other things, interactive rebase: adopteungit.fr/en/methodology/2017...
I will try this out.