Skip to content

Commit

Permalink
farward -> forward
Browse files Browse the repository at this point in the history
修正一处拼写错误
  • Loading branch information
fanofxiaofeng authored Nov 24, 2018
1 parent bdb8189 commit 592bf84
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion notes/Git.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Creating a new branch is quick AND simple.

# Fast forward

"快进式合并"(fast-farward merge),会直接将 master 分支指向合并的分支,这种模式下进行分支合并会丢失分支信息,也就不能在分支历史上看出分支信息。
"快进式合并"(fast-forward merge),会直接将 master 分支指向合并的分支,这种模式下进行分支合并会丢失分支信息,也就不能在分支历史上看出分支信息。

可以在合并时加上 --no-ff 参数来禁用 Fast forward 模式,并且加上 -m 参数让合并时产生一个新的 commit。

Expand Down

0 comments on commit 592bf84

Please sign in to comment.