Three minutes to teach you to learn git (12) Fast-forward

What is fast forward, as the name implies, is fast forward, how does git do it fast?

If git determines that it can fast forward, directly modify the current head pointer and then modify the current head pointer, it is white to modify the direction of two pointers, and did not generate a new commit object.

So when you change one of the commits in one of the branch, the other branch if the commit is also referenced, the branch will change unexpectedly because the same commit object is referenced.

So there are generally several ways:

1--no-ff

Display tells git not to fast forward

2 Cherry-pick

3--squash

Merge all commits into a commit, which is sure to generate a new commit.

Original: http://blog.csdn.net/hongchangfirst/article/details/45484191

Author: Hongchangfirst

Hongchangfirst's homepage: http://blog.csdn.net/hongchangfirst

Three minutes to teach you to learn git (12) Fast-forward