Rebasing, for use when a developer may prefer a clean commit history without merging commits. Developers used to merging branches can still use the same workflow, but those working in a repository ...