Git Avoid merge commits by using a rebase workflow. Squash multiple trivial commits into a single commit. Write a good commit message.