To get the best of both worlds: You could use normal merges while working on a branch, and then when it's done do one rebase (which also removes merge commits)

To get the best of both worlds: You could use normal merges while working on a branch, and then when it's done do one rebase (which also removes merge commits) before merging back into master.