update

conchsea · Mar 17, 2018 · 3012a1b · 3012a1b
1 parent f7f5cfa
commit 3012a1b
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/git-cmd.txt b/git-cmd.txt
@@ -39,3 +39,5 @@ Switched to branch 'dev'
 git branch命令会列出所有分支，当前分支前面会标一个*号。
 
 git merge命令用于合并指定分支到当前分支。
+
+git merge --no-ff -m "merge with no-ff