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.
The inspiration for the document came from noticing how frequently LinusTorvaldswas unhappy with how other peopletypically subsystem maintainershandledtheir git trees.
It8217s interesting to note that before Linus wrote the git tool branching andmerging was virtually unheard of in the Open Source world. In CVS it was anightmare horror of leechcraft and broken magic. Other tools were not much better.One of the primary motivations behind gitaside from blazing speedwas infact to make branching and merging trivial operationsand so they have become.
One of the offshoots of branching and merging Jonathan wrote was rebasingaltering the patch history of a local repository. The benefits of rebasing arefantastic. They can make a repository history cleaner and clearer which in turncan make it easier to track down the patches that introduced a given bug. Sorebasing has a direct value to the development process.