Re:Four Steps to Maintaining a Clean Git History
by mkiwala on Sunday April 23, 2017 @09:43PM
(#14181425)
What you are describing is not what the author of the article is advocating, which is `git merge --squash`.
What you've described -- committing often and later combining commits together into cohesive units that don't break tests -- is a lot like how I work. I use `git rebase -i` for this; never `git merge --squash`.
What you've described -- committing often and later combining commits together into cohesive units that don't break tests -- is a lot like how I work. I use `git rebase -i` for this; never `git merge --squash`.