Jonathan Corbet wrote a document for inclusion in the kernel tree, describing best practices for merging and rebasing git-based kernel repositories. As he put it, it represented workflows that were ...

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 ...