Commit history
Keep it how you like.
"Merge or rebase?" seems to be a perpetual source of debate. It shouldn't be; don't listen to anybody with an unconditional opinion on this topic. Whether it's worth maintaining a cleaned-up version history depends entirely on the kind of project!
Some reasons to rebase commits to clean up the log:
With a slow-moving open source project where the commit l…