Jonathan Corbet wrote a document for inclusion in the kernel tree, describingbest practices for merging and rebasing git-based kernel repositories. As he putit, it represented workflows that were actually in current use, and it was a livingdocument that hopefully would be added to and corrected over time.

Source: LXer – Documenting Proper Git Usage