merge方式区别
Elsa@LAPTOP-FTJ9AMAJ MINGW64 ~/Desktop/learn-git (master)
$ git checkout -b dev
Switched to a new branch 'dev'
Elsa@LAPTOP-FTJ9AMAJ MINGW64 ~/Desktop/learn-git (dev)
$ git add readme.txt
Elsa@LAPTOP-FTJ9AMAJ MINGW64 ~/Desktop/learn-git (dev)
$ git commit -m"no fast forward"
[dev 9649442] no fast forward
1 file changed, 1 insertion(+)
Elsa@LAPTOP-FTJ9AMAJ MINGW64 ~/Desktop/learn-git (dev)
$ git branch
* dev
master
Elsa@LAPTOP-FTJ9AMAJ MINGW64 ~/Desktop/learn-git (dev)
$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
Elsa@LAPTOP-FTJ9AMAJ MINGW64 ~/Desktop/learn-git (master)
$ git merge --no-ff -m"merge with no ff" dev
Merge made by the 'recursive' strategy.
readme.txt | 1 +
1 file changed, 1 insertion(+)
Elsa@LAPTOP-FTJ9AMAJ MINGW64 ~/Desktop/learn-git (master)
$ git log --graph --pretty=oneline --abbrev-commit
* ffb4a96 (HEAD -> master) merge with no ff
|\
| * 9649442 (dev) no fast forward
|/
* 4272c0d (origin/master) conflict fixed
|\
| * eff9d7a & simple
* | d51da50 and simple
|/
* 181497a branch test
* 94ef284 remove test.txt
* 728c967 remove ssh txt
* 4dc6454 added github ssh txt
* b68870d added a new test txt file.
* 6675e55 added free
* c9f6535 added a new file readme.txt
