git merge本地分支后远程到master操作

版权声明:©懂你科技(https://dongni.net/) https://blog.csdn.net/u011087213/article/details/84638019

操作命令:
ls
git checkout dev
ls
git checkout master
git merge dev
git push origin master
git log

操作过程:
18:50:19 ~/program/dongde br: master* ls
README.md bash      python
18:50:22 ~/program/dongde br: master* git checkout dev
Switched to branch 'dev'
lYour branch is up-to-date with 'origin/dev'.
s18:50:29 ~/program/dongde br: dev* ls
README.md bash      c         python
18:50:30 ~/program/dongde br: dev* git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
18:50:37 ~/program/dongde br: master* git merge dev
Updating 7592f19..abd7380
Fast-forward
 c/a.out        | Bin 0 -> 8480 bytes
 c/big_little.c |  12 +++
 c/cpu_endian   | Bin 0 -> 8456 bytes
 c/cpu_endian.c |  12 +++
 c/getchar.c    |  16 ++++
 c/myshell.c    |  97 ++++++++++++++++++++++
 c/traceroute.c | 385 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 522 insertions(+)
 create mode 100755 c/a.out
 create mode 100644 c/big_little.c
 create mode 100755 c/cpu_endian
 create mode 100644 c/cpu_endian.c
 create mode 100644 c/getchar.c
 create mode 100644 c/myshell.c
 create mode 100644 c/traceroute.c
18:50:43 ~/program/dongde br: master* git push origin master
Total 0 (delta 0), reused 0 (delta 0)
To github.com:dongde/dongde.git
   7592f19..abd7380  master -> master
18:50:58 ~/program/dongde br: master* git log
abd7380a98e6b25b54991eac3446bda5497677fe add c directory and files
7592f19e158165dacb4a2dcff6abe06c58aadb66 add python directory
53a1e6086563bce0831261c9e2ea273403d1767a deploy bash shell script
b70362ed43b29f0b02996e8ad95d19b922722803 update README.md
6cdcfe73de77ae1c375cc69c84532c59c193ec9c first commit
18:51:01 ~/program/dongde br: master*

猜你喜欢

转载自blog.csdn.net/u011087213/article/details/84638019