Merge pull request progit#305 from zheeeng/patch-1

git merge --squash 不需要添加 --no-commit
michael-ancestor · Apr 10, 2016 · 488dba6 · 488dba6
2 parents 9d8a9d0 + b52ff84
commit 488dba6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/book/05-distributed-git/sections/contributing.asc b/book/05-distributed-git/sections/contributing.asc
@@ -602,7 +602,7 @@ image::images/public-small-2.png[`featureA` 工作之后的提交历史。]
 [source,console]
 -----
 $ git checkout -b featureBv2 origin/master
-$ git merge --no-commit --squash featureB
+$ git merge --squash featureB
 # (change implementation)
 $ git commit
 $ git push myfork featureBv2