git命令行合并分支

参考

步骤

• 切到目标分支 git checkout 目标分支名
• git merge 将被合并的分支名
• 需要输入提示信息，按esc后输入:wq 保存退出

jie@mozq MINGW64 /d/00/01/git_01/demo2
$ git init
Initialized empty Git repository in D:/00/01/git_01/demo2/.git/

jie@mozq MINGW64 /d/00/01/git_01/demo2 (master)
$ git checkout dev
error: pathspec 'dev' did not match any file(s) known to git.

jie@mozq MINGW64 /d/00/01/git_01/demo2 (master)
$ git checkout -b dev
Switched to a new branch 'dev'

jie@mozq MINGW64 /d/00/01/git_01/demo2 (dev)
$ git branch -a

jie@mozq MINGW64 /d/00/01/git_01/demo2 (dev)
$ git branch -v

jie@mozq MINGW64 /d/00/01/git_01/demo2 (dev)
$ git add .

jie@mozq MINGW64 /d/00/01/git_01/demo2 (dev)
$ git status
On branch dev

Initial commit

Changes to be committed:
  (use "git rm --cached <file>..." to unstage)

        new file:   hash.txt


jie@mozq MINGW64 /d/00/01/git_01/demo2 (dev)
$ git commit -m 1
[dev (root-commit) bf463c0] 1
 1 file changed, 1 insertion(+)
 create mode 100644 hash.txt

jie@mozq MINGW64 /d/00/01/git_01/demo2 (dev)
$ git branch -v
* dev bf463c0 1

jie@mozq MINGW64 /d/00/01/git_01/demo2 (dev)
$ git checkout -b bug
Switched to a new branch 'bug'

jie@mozq MINGW64 /d/00/01/git_01/demo2 (bug)
$ git branch -v
* bug bf463c0 1
  dev bf463c0 1

jie@mozq MINGW64 /d/00/01/git_01/demo2 (bug)
$ git add .

jie@mozq MINGW64 /d/00/01/git_01/demo2 (bug)
$ git status
On branch bug
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        new file:   bug1.txt


jie@mozq MINGW64 /d/00/01/git_01/demo2 (bug)
$ git commit -m bug1
[bug 37ce9e5] bug1
 1 file changed, 1 insertion(+)
 create mode 100644 bug1.txt

jie@mozq MINGW64 /d/00/01/git_01/demo2 (bug)
$ git checkout dev
Switched to branch 'dev'

jie@mozq MINGW64 /d/00/01/git_01/demo2 (dev)
$ git add .

jie@mozq MINGW64 /d/00/01/git_01/demo2 (dev)
$ git commit -m dev1
[dev 850876e] dev1
 1 file changed, 1 insertion(+)
 create mode 100644 dev1.txt

jie@mozq MINGW64 /d/00/01/git_01/demo2 (dev)
$ git log --graph
* commit 850876ed3a43fb5cec66cc4a5618b97158e75d59 (HEAD -> dev)
| Author: xiechangzhou <[e-mail]>
| Date:   Wed Feb 19 15:07:16 2020 +0800
|
|     dev1
|
* commit bf463c031d9d2a8dca6f991cdccf056495bedff1
  Author: xiechangzhou <[e-mail]>
  Date:   Wed Feb 19 15:05:25 2020 +0800

      1

jie@mozq MINGW64 /d/00/01/git_01/demo2 (dev)
$ git log --graph --all
* commit 850876ed3a43fb5cec66cc4a5618b97158e75d59 (HEAD -> dev)
| Author: xiechangzhou <[e-mail]>
| Date:   Wed Feb 19 15:07:16 2020 +0800
|
|     dev1
|
| * commit 37ce9e56c35dbe3d991899a55e139aa412b36d78 (bug)
|/  Author: xiechangzhou <[e-mail]>
|   Date:   Wed Feb 19 15:06:30 2020 +0800
|
|       bug1
|
* commit bf463c031d9d2a8dca6f991cdccf056495bedff1
  Author: xiechangzhou <[e-mail]>
  Date:   Wed Feb 19 15:05:25 2020 +0800

      1

jie@mozq MINGW64 /d/00/01/git_01/demo2 (dev)
$ git merge bug
Merge made by the 'recursive' strategy.
 bug1.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 bug1.txt

jie@mozq MINGW64 /d/00/01/git_01/demo2 (dev)
$ git log --graph --all
*   commit 75f72cd18d3bf8c8e9661ab2aa76c525764cc53a (HEAD -> dev)
|\  Merge: 850876e 37ce9e5
| | Author: xiechangzhou <[e-mail]>
| | Date:   Wed Feb 19 15:08:58 2020 +0800
| |
| |     合并bug
| |
| * commit 37ce9e56c35dbe3d991899a55e139aa412b36d78 (bug)
| | Author: xiechangzhou <[e-mail]>
| | Date:   Wed Feb 19 15:06:30 2020 +0800
| |
| |     bug1
| |
* | commit 850876ed3a43fb5cec66cc4a5618b97158e75d59
|/  Author: xiechangzhou <[e-mail]>
|   Date:   Wed Feb 19 15:07:16 2020 +0800
|
|       dev1
|
* commit bf463c031d9d2a8dca6f991cdccf056495bedff1
  Author: xiechangzhou <[e-mail]>
  Date:   Wed Feb 19 15:05:25 2020 +0800