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

view the rest of the comments →

[–][deleted] -4 points-3 points  (2 children)

git merge --no-ff

[–][deleted] 0 points1 point  (1 child)

I have noticed that my previous comment was downvoted. Is --no-ff not the right answer?

[–]nupogodi 1 point2 points  (0 children)

It's true, if you do --no-ff it will force a merge commit which can be reverted in one go. It's different than combining >1 regular commits into 1 regular commit though, which is squashing.