F盘下创建一个本地版本库testGitHub 模拟一个用户
admin@DESKTOP-6HL5242 MINGW64 /f
$ mkdir testGitHub
admin@DESKTOP-6HL5242 MINGW64 /f
$ cd testGitHub
admin@DESKTOP-6HL5242 MINGW64 /f/testGitHub
$ git init
Initialized empty Git repository in F:/testGitHub/.git/
添加文件到暂存区并提交
admin@DESKTOP-6HL5242 MINGW64 /f/testGitHub (master)
$ git add a.txt
admin@DESKTOP-6HL5242 MINGW64 /f/testGitHub (master)
$ git status
On branch master
No commits yet
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: a.txt
admin@DESKTOP-6HL5242 MINGW64 /f/testGitHub (master)
$ git commit -m "commit"
[master (root-commit) f42816b] commit
1 file changed, 1 insertion(+)
create mode 100644 a.txt
本地库关联远程仓库
admin@DESKTOP-6HL5242 MINGW64 /f/testGitHub (master)
$ git remote add origin git@github.com:RisingSunYZ/testGitHub.git
admin@DESKTOP-6HL5242 MINGW64 /f/testGitHub (master)
$ git push -u origin master
Counting objects: 3, done.
Writing objects: 100% (3/3), 202 bytes | 202.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To github.com:RisingSunYZ/testGitHub.git
* [new branch] master -> master
Branch 'master' set up to track remote branch 'master' from 'origin'.
创建分支 并在dev分支修改 提交 合并 并 将dev分支推送到远程库
admin@DESKTOP-6HL5242 MINGW64 /f/testGitHub (master)
$ git checkout -b dev
Switched to a new branch 'dev'
admin@DESKTOP-6HL5242 MINGW64 /f/testGitHub (dev)
$ git add a.txt
admin@DESKTOP-6HL5242 MINGW64 /f/testGitHub (dev)
$ git commit -m "2commit"
[dev b4d4c17] 2commit
1 file changed, 2 insertions(+), 1 deletion(-)
admin@DESKTOP-6HL5242 MINGW64 /f/testGitHub (dev)
$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
admin@DESKTOP-6HL5242 MINGW64 /f/testGitHub (master)
$ git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
admin@DESKTOP-6HL5242 MINGW64 /f/testGitHub (master)
$ git merge dev --no-ff -m "3commit"
Merge made by the 'recursive' strategy.
a.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
admin@DESKTOP-6HL5242 MINGW64 /f/testGitHub (master)
$ git push origin dev
Counting objects: 3, done.
Writing objects: 100% (3/3), 232 bytes | 232.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To github.com:RisingSunYZ/testGitHub.git
* [new branch] dev -> dev
admin@DESKTOP-6HL5242 MINGW64 /f/testGitHub (master)
$ git push origin master
Counting objects: 1, done.
Writing objects: 100% (1/1), 196 bytes | 196.00 KiB/s, done.
Total 1 (delta 0), reused 0 (delta 0)
To github.com:RisingSunYZ/testGitHub.git
f42816b..117fa68 master -> master
在E盘克隆远程库
admin@DESKTOP-6HL5242 MINGW64 /f
$ cd e:
admin@DESKTOP-6HL5242 MINGW64 /e
$ git clone git@github.com:RisingSunYZ/testGitHub.git
Cloning into 'testGitHub'...
remote: Counting objects: 7, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 7 (delta 1), reused 6 (delta 0), pack-reused 0
Receiving objects: 100% (7/7), done.
Resolving deltas: 100% (1/1), done.
admin@DESKTOP-6HL5242 MINGW64 /e
$ cd testGitHub
发现只抓取了master分支 我们在本地库创建dev分支并与远程库关联 并修改内容提交到远程库
admin@DESKTOP-6HL5242 MINGW64 /e/testGitHub (master)
$ git branch
* master
admin@DESKTOP-6HL5242 MINGW64 /e/testGitHub (master)
$ git checkout -b dev origin/dev
Switched to a new branch 'dev'
Branch 'dev' set up to track remote branch 'dev' from 'origin'.
admin@DESKTOP-6HL5242 MINGW64 /e/testGitHub (dev)
$ git branch
* dev
master
admin@DESKTOP-6HL5242 MINGW64 /e/testGitHub (dev)
$ git add a.txt
admin@DESKTOP-6HL5242 MINGW64 /e/testGitHub (dev)
$ git commit -m "commit"
[dev ec6ac87] commit
1 file changed, 2 insertions(+), 1 deletion(-)
admin@DESKTOP-6HL5242 MINGW64 /e/testGitHub (dev)
$ git status
On branch dev
Your branch is ahead of 'origin/dev' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
admin@DESKTOP-6HL5242 MINGW64 /e/testGitHub (dev)
$ git push origin dev
Counting objects: 3, done.
Writing objects: 100% (3/3), 246 bytes | 246.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To github.com:RisingSunYZ/testGitHub.git
b4d4c17..ec6ac87 dev -> dev
admin@DESKTOP-6HL5242 MINGW64 /e/testGitHub (dev)
$ git remote
origin
admin@DESKTOP-6HL5242 MINGW64 /e/testGitHub (dev)
$ git remote -v
origin git@github.com:RisingSunYZ/testGitHub.git (fetch)
origin git@github.com:RisingSunYZ/testGitHub.git (push)