From 3012a1b63322f8cbb0a4b3cf3f77d6f058eccbae Mon Sep 17 00:00:00 2001 From: hyy Date: Sat, 17 Mar 2018 15:55:35 +0800 Subject: [PATCH] update --- git-cmd.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git-cmd.txt b/git-cmd.txt index dab53f5..2190bf7 100644 --- 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