5. The basic logic of the branching 5.1-yan
The merge operation, as shown, merges two pointer states.
Rebase is also the Yan-he:
Principle: Looking for the common ancestor of two branches, according to the current branch is now checkout state branch, relative to the common ancestor after the successive submissions to generate a series of patch files, such as starting from a common ancestor file, submitted 10 times, then will generate 10 patch files, then use Git Rebase Master for the rebase, where master is the base branch, the Rebase will be based on its last commit object as a new starting point, and then to prepare the patch file, a dozen, eventually generated a new object, this object is the direct downstream of master.
At this point, if checkout master, then the merge operation, will be fast-forward, because already on the same line.
Linux------Git-5