Git 以分支的方式同时管理多个项目
F:\Demo\D11>tree /F文件夹 PATH 列表
卷序列号为 A627-5B49
F:.
└─master
main.txt
F:\Demo\D11>git status
fatal: Not a git repository (or any of the parent directories): .git
F:\Demo\D11>git init
Initialized empty Git repository in F:/Demo/D11/.git/
F:\Demo\D11>git status
On branch master
Initial commit
Untracked files:
(use "git add <file>..." to include in what will be committed)
master/
nothing added to commit but untracked files present (use "git add" to track)
F:\Demo\D11>git add --all
F:\Demo\D11>git status
On branch master
Initial commit
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: master/main.txt
F:\Demo\D11>git commit -a -m "master branch init"
master branch init
1 file changed, 1 insertion(+)
create mode 100644 master/main.txt
F:\Demo\D11>git commit -a -m "master edit"
master edit
1 file changed, 3 insertions(+), 1 deletion(-)
F:\Demo\D11>git checkout -b "master-dev"
Switched to a new branch 'master-dev'
F:\Demo\D11>git status
On branch master-dev
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: master/main.txt
no changes added to commit (use "git add" and/or "git commit -a")
F:\Demo\D11>git commit -a -m "master-dev edit"
master-dev edit
1 file changed, 3 insertions(+), 1 deletion(-)
F:\Demo\D11>git show-branch
! master edit
* master-dev edit
--
* master-dev edit
+* master edit
F:\Demo\D11>git tree --all
WARNING: terminal is not fully functional
* 67837dd (HEAD, master-dev) master-dev edit
* 60197ce (master) master edit
* 3ae67eb master branch init
F:\Demo\D11>git citool
F:\Demo\D11>git checkout --orphan pc
Switched to a new branch 'pc'
F:\Demo\D11>git status
On branch pc
Initial commit
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: master/main.txt
Untracked files:
(use "git add <file>..." to include in what will be committed)
pc/
F:\Demo\D11>git rm -r master/
rm 'master/main.txt'
F:\Demo\D11>RD /Smaster/
f:\demo\d11\master, 是否确认(Y/N)? Y
F:\Demo\D11>tree /F
文件夹 PATH 列表
卷序列号为 A627-5B49
F:.
└─pc
pc.txt
F:\Demo\D11>git add --all
F:\Demo\D11>git commit -a -m "pc/pc init"
pc/pc init
1 file changed, 1 insertion(+)
create mode 100644 pc/pc.txt
F:\Demo\D11>git show-branch
! master edit
! master-dev edit
* pc/pc init
---
* pc/pc init
+ master-dev edit
++ master edit
++ master branch init
F:\Demo\D11>git tree --all
WARNING: terminal is not fully functional
* 3e176c6 (HEAD, pc) pc/pc init
* 67837dd (master-dev) master-dev edit
* 60197ce (master) master edit
* 3ae67eb master branch init
F:\Demo\D11>git status
On branch pc
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: pc/pc.txt
no changes added to commit (use "git add" and/or "git commit -a")
F:\Demo\D11>git commit -a -m "pc edit"
pc edit
1 file changed, 3 insertions(+), 1 deletion(-)
F:\Demo\D11>git commit -a -m "pc reedit"
pc reedit
1 file changed, 3 insertions(+), 1 deletion(-)
F:\Demo\D11>git show-branch
! master edit
! master-dev edit
* pc reedit
---
* pc reedit
* pc edit
* pc/pc init
+ master-dev edit
++ master edit
++ master branch init
F:\Demo\D11>git tree --all
WARNING: terminal is not fully functional
* 2fd85bf (HEAD, pc) pc reedit
* d1f98d3 pc edit
* 3e176c6 pc/pc init
* 67837dd (master-dev) master-dev edit
* 60197ce (master) master edit
* 3ae67eb master branch init
F:\Demo\D11>git checkout "master-dev"
Switched to branch 'master-dev'
F:\Demo\D11>git diff
WARNING: terminal is not fully functional
diff --git a/master/main.txt b/master/main.txt
index 75bf703..5a345f8 100644
--- a/master/main.txt
+++ b/master/main.txt
@@ -2,4 +2,6 @@ main/main init
master edit
-master-dev edit
\ No newline at end of file
+master-dev edit
+master-dev reedit
+
F:\Demo\D11>git commit -a -m "master-dev reedit"
master-dev reedit
1 file changed, 3 insertions(+), 1 deletion(-)
F:\Demo\D11>git show-branch
! master edit
* master-dev reedit
! pc reedit
---
* master-dev reedit
* master-dev edit
+* master edit
+* master branch init
+ pc reedit
+ pc edit
+ pc/pc init
F:\Demo\D11>git tree --all
WARNING: terminal is not fully functional
* 67cec74 (HEAD, master-dev) master-dev reedit
* 67837dd master-dev edit
* 60197ce (master) master edit
* 3ae67eb master branch init
* 2fd85bf (pc) pc reedit
* d1f98d3 pc edit
* 3e176c6 pc/pc init
F:\Demo\D11>git checkout master
Switched to branch 'master'
F:\Demo\D11>git commit -a -m "master reedit"
master reedit
1 file changed, 3 insertions(+), 1 deletion(-)
F:\Demo\D11>git show-branch
* master reedit
! master-dev reedit
! pc reedit
---
* master reedit
+ master-dev reedit
+ master-dev edit
*+ master edit
*+ master branch init
+ pc reedit
+ pc edit
+ pc/pc init
F:\Demo\D11>git tree --all
WARNING: terminal is not fully functional
* b79efa5 (HEAD, master) master reedit
| * 67cec74 (master-dev) master-dev reedit
| * 67837dd master-dev edit
|/
* 60197ce master edit
* 3ae67eb master branch init
* 2fd85bf (pc) pc reedit
* d1f98d3 pc edit
* 3e176c6 pc/pc init
F:\Demo\D11>git citool
F:\Demo\D11>git checkout pc
Switched to branch 'pc'
F:\Demo\D11>git commit -a -m "pc re-reedit"
pc re-reedit
1 file changed, 3 insertions(+), 1 deletion(-)
F:\Demo\D11>git show-branch
! master reedit
! master-dev reedit
* pc re-reedit
---
* pc re-reedit
* pc reedit
* pc edit
* pc/pc init
+ master reedit
+ master-dev reedit
+ master-dev edit
++ master edit
++ master branch init
F:\Demo\D11>git tree --all
WARNING: terminal is not fully functional
* 1d24c39 (HEAD, pc) pc re-reedit
* 2fd85bf pc reedit
* d1f98d3 pc edit
* 3e176c6 pc/pc init
* b79efa5 (master) master reedit
| * 67cec74 (master-dev) master-dev reedit
| * 67837dd master-dev edit
|/
* 60197ce master edit
* 3ae67eb master branch init
F:\Demo\D11>git checkout --orphan mobile
Switched to a new branch 'mobile'
F:\Demo\D11>git status
On branch mobile
Initial commit
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: pc/pc.txt
Untracked files:
(use "git add <file>..." to include in what will be committed)
mobile/
F:\Demo\D11>tree /F
文件夹 PATH 列表
卷序列号为 A627-5B49
F:.
├─mobile
│ mobile.txt
│
└─pc
F:\Demo\D11>RD /S f:\demo\d11\pc
f:\demo\d11\pc, 是否确认(Y/N)? Y
F:\Demo\D11>tree /F
文件夹 PATH 列表
卷序列号为 A627-5B49
F:.
└─mobile
mobile.txt
F:\Demo\D11>git status
On branch mobile
Initial commit
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: pc/pc.txt
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
deleted: pc/pc.txt
Untracked files:
(use "git add <file>..." to include in what will be committed)
mobile/
F:\Demo\D11>git rm -r pc/
rm 'pc/pc.txt'
F:\Demo\D11>git status
On branch mobile
Initial commit
Untracked files:
(use "git add <file>..." to include in what will be committed)
mobile/
nothing added to commit but untracked files present (use "git add" to track)
F:\Demo\D11>git add --all
F:\Demo\D11>git commit -a -m "pc/pc master init"
pc/pc master init
1 file changed, 1 insertion(+)
create mode 100644 mobile/mobile.txt
F:\Demo\D11>git show-branch
! master reedit
! master-dev reedit
* pc/pc master init
! pc re-reedit
----
* pc/pc master init
+ pc re-reedit
+ pc reedit
+ pc edit
+ pc/pc init
+ master reedit
+ master-dev reedit
+ master-dev edit
++ master edit
++ master branch init
F:\Demo\D11>git tree --all
WARNING: terminal is not fully functional
* a94d110 (HEAD, mobile) pc/pc master init
* 1d24c39 (pc) pc re-reedit
* 2fd85bf pc reedit
* d1f98d3 pc edit
* 3e176c6 pc/pc init
* b79efa5 (master) master reedit
| * 67cec74 (master-dev) master-dev reedit
| * 67837dd master-dev edit
|/
* 60197ce master edit
* 3ae67eb master branch init
F:\Demo\D11>git show-branch
! master reedit
! master-dev reedit
* pc/pc master init
! pc re-reedit
----
* pc/pc master init
+ pc re-reedit
+ pc reedit
+ pc edit
+ pc/pc init
+ master reedit
+ master-dev reedit
+ master-dev edit
++ master edit
++ master branch init
F:\Demo\D11>git commit -a -m "mobile edit"
mobile edit
1 file changed, 3 insertions(+), 1 deletion(-)
F:\Demo\D11>git commit -a -m "mobile re-edit"
mobile re-edit
1 file changed, 3 insertions(+), 1 deletion(-)
F:\Demo\D11>git show-branch
! master reedit
! master-dev reedit
* mobile re-edit
! pc re-reedit
----
* mobile re-edit
* mobile edit
* pc/pc master init
+ pc re-reedit
+ pc reedit
+ pc edit
+ pc/pc init
+ master reedit
+ master-dev reedit
+ master-dev edit
++ master edit
++ master branch init
F:\Demo\D11>
F:\Demo\D11>git tree --all
WARNING: terminal is not fully functional
* 70dc006 (HEAD, mobile) mobile re-edit
* de5452e mobile edit
* a94d110 pc/pc master init
* 1d24c39 (pc) pc re-reedit
* 2fd85bf pc reedit
* d1f98d3 pc edit
* 3e176c6 pc/pc init
* b79efa5 (master) master reedit
| * 67cec74 (master-dev) master-dev reedit
| * 67837dd master-dev edit
|/
* 60197ce master edit
* 3ae67eb master branch init
F:\Demo\D11>git checkout "master-dev"
Switched to branch 'master-dev'
F:\Demo\D11>git commit -a -m "master-dev re-reedit"
master-dev re-reedit
1 file changed, 2 insertions(+)
F:\Demo\D11>git show-branch
! master reedit
* master-dev re-reedit
! mobile re-edit
! pc re-reedit
----
* master-dev re-reedit
* master-dev reedit
* master-dev edit
+ mobile re-edit
+ mobile edit
+ pc/pc master init
+ pc re-reedit
+ pc reedit
+ pc edit
+ pc/pc init
+ master reedit
+* master edit
+* master branch init
F:\Demo\D11>git tree --all
WARNING: terminal is not fully functional
* 1c57e77 (HEAD, master-dev) master-dev re-reedit
* 67cec74 master-dev reedit
* 67837dd master-dev edit
| * 70dc006 (mobile) mobile re-edit
| * de5452e mobile edit
| * a94d110 pc/pc master init
| * 1d24c39 (pc) pc re-reedit
| * 2fd85bf pc reedit
| * d1f98d3 pc edit
| * 3e176c6 pc/pc init
| * b79efa5 (master) master reedit
|/
* 60197ce master edit
* 3ae67eb master branch init
F:\Demo\D11>git checkout master
Switched to branch 'master'
F:\Demo\D11>git commit -a -m "master re-reedit"
master re-reedit
1 file changed, 3 insertions(+), 1 deletion(-)
F:\Demo\D11>git show-branch
* master re-reedit
! master-dev re-reedit
! mobile re-edit
! pc re-reedit
----
* master re-reedit
* master reedit
+ master-dev re-reedit
+ master-dev reedit
+ master-dev edit
*+ master edit
*+ master branch init
+ mobile re-edit
+ mobile edit
+ pc/pc master init
+ pc re-reedit
+ pc reedit
+ pc edit
+ pc/pc init
F:\Demo\D11>git tree --all
WARNING: terminal is not fully functional
* a0a0f1a (HEAD, master) master re-reedit
* b79efa5 master reedit
| * 1c57e77 (master-dev) master-dev re-reedit
| * 67cec74 master-dev reedit
| * 67837dd master-dev edit
|/
* 60197ce master edit
* 3ae67eb master branch init
* 70dc006 (mobile) mobile re-edit
* de5452e mobile edit
* a94d110 pc/pc master init
* 1d24c39 (pc) pc re-reedit
* 2fd85bf pc reedit
* d1f98d3 pc edit
* 3e176c6 pc/pc init
F:\Demo\D11>git checkout pc
Deletion of directory 'master' failed. Should I try again? (y/n) n
Switched to branch 'pc'
F:\Demo\D11>git status
On branch pc
nothing to commit, working directory clean
F:\Demo\D11>git commit -a -m "pc re-re-reedit"
pc re-re-reedit
1 file changed, 3 insertions(+), 1 deletion(-)
F:\Demo\D11>git show-branch
! master re-reedit
! master-dev re-reedit
! mobile re-edit
* pc re-re-reedit
----
* pc re-re-reedit
* pc re-reedit
* pc reedit
* pc edit
* pc/pc init
+ master re-reedit
+ master reedit
+ master-dev re-reedit
+ master-dev reedit
+ master-dev edit
++ master edit
++ master branch init
+ mobile re-edit
+ mobile edit
+ pc/pc master init
F:\Demo\D11>git tree --all
WARNING: terminal is not fully functional
* 0f657c0 (HEAD, pc) pc re-re-reedit
* 1d24c39 pc re-reedit
* 2fd85bf pc reedit
* d1f98d3 pc edit
* 3e176c6 pc/pc init
* a0a0f1a (master) master re-reedit
* b79efa5 master reedit
| * 1c57e77 (master-dev) master-dev re-reedit
| * 67cec74 master-dev reedit
| * 67837dd master-dev edit
|/
* 60197ce master edit
* 3ae67eb master branch init
* 70dc006 (mobile) mobile re-edit
* de5452e mobile edit
* a94d110 pc/pc master init
F:\Demo\D11>git checkout "master-dev"
Deletion of directory 'pc' failed. Should I try again? (y/n) n
Switched to branch 'master-dev'
F:\Demo\D11>git commit -a -m "master-dev re-re-reedit"
master-dev re-re-reedit
1 file changed, 1 insertion(+)
F:\Demo\D11>git show-branch
! master re-reedit
* master-dev re-re-reedit
! mobile re-edit
! pc re-re-reedit
----
* master-dev re-re-reedit
* master-dev re-reedit
* master-dev reedit
* master-dev edit
+ pc re-re-reedit
+ pc re-reedit
+ pc reedit
+ pc edit
+ pc/pc init
+ master re-reedit
+ master reedit
+* master edit
+* master branch init
+ mobile re-edit
+ mobile edit
+ pc/pc master init
F:\Demo\D11>git tree --all
WARNING: terminal is not fully functional
* a6be472 (HEAD, master-dev) master-dev re-re-reedit
* 1c57e77 master-dev re-reedit
* 67cec74 master-dev reedit
* 67837dd master-dev edit
| * 0f657c0 (pc) pc re-re-reedit
| * 1d24c39 pc re-reedit
| * 2fd85bf pc reedit
| * d1f98d3 pc edit
| * 3e176c6 pc/pc init
| * a0a0f1a (master) master re-reedit
| * b79efa5 master reedit
|/
* 60197ce master edit
* 3ae67eb master branch init
* 70dc006 (mobile) mobile re-edit
* de5452e mobile edit
* a94d110 pc/pc master init
F:\Demo\D11>git checkout pc
Already on 'pc'
F:\Demo\D11>git commit -a -m "pc re-re-re-reedit"
pc re-re-re-reedit
1 file changed, 3 insertions(+), 1 deletion(-)
F:\Demo\D11>
页:
[1]