Basic Branching and Merging
两种合并的情况:Fast-forward
,merge-commit
1. Fast-forward
快进
when you try to merge one commit with a commit that can be reached by following the first commit’s history, Git simplifies things by moving the pointer forward because there is no divergent work to merge together — this is called a “fast-forward.”
如下:将hotfix
分支合并到master
分支上,只是将master
分支上的指针向前移了一下。
$ git checkout master
$ git merge hotfix
Updating f42c576..3a0874c
Fast-forward
index.html | 2 ++
1 file changed, 2 insertions(+)