转载自:https://sandofsky.com/images/fast_forward.pdf
fast forward will not have the merge commit, but no-fast-forward will have the merge commit.
转载自:https://sandofsky.com/images/fast_forward.pdf
fast forward will not have the merge commit, but no-fast-forward will have the merge commit.