25.git分支
26.创建分支
语法:$git branch 分支名称
示例:$ git branch feature
若无任何反应则创建成功
27.查看创建分支状态
语法:$ git log –decorate
示例:
$ git log –decorate
commit fdf2ea4312b7d1c9e4d71a9c44d19b75a26945ea (HEAD -> master, feature)
Author:t_tamir <t_tamir@126.com>
Date: Sat Oct 14 10:29:03 2017 +0800
add feature
commit 7b7cf0be0c3110b0802e3a3c9a80f9736c6a992a
Author:t_tamir <t_tamir@126.com>
Date: Sat Oct 14 09:21:05 2017 +0800
word game : first
示例中:
(HEAD -> master, feature)
HEAD指针默认指向master,(Master是系统默认分支),还有HEAD没有指向的feature分支(feature分支是我们新创建的分支)
28.切换分支
语法:$git checkout 分支名
示例:
$git checkout feature
Switchedto branch 'feature'
查看HEAD指针
$git log --decorate
commit fdf2ea4312b7d1c9e4d71a9c44d19b75a26945ea (HEAD -> feature, master)
Author:t_tamir <t_tamir@126.com>
Date: Sat Oct 14 10:29:03 2017 +0800
add feature
commit 7b7cf0be0c3110b0802e3a3c9a80f9736c6a992a
Author:t_tamir <t_tamir@126.com>
Date: Sat Oct 14 09:21:05 2017 +0800
word game : first
结果显示HEAD已经切换到feature
(HEAD -> feature, master)
精简显示模式: 添加“—oneline”
示例代码:
$git log --decorate --oneline
fdf2ea4 (HEAD -> feature, master) add feature
7b7cf0b word game : first
结果显示HEAD已经切换到feature
(HEAD -> feature, master)
29. 修改 MyProject2 中的README.md文件:添加“power by tamir”,之后添加到暂存区,提交到仓库。
查看分支状态:
$git log --decorate --oneline
0888d1d (HEAD -> feature) change the README file
fdf2ea4 (master) add feature
7b7cf0b word game : first
切换到master主分支
$gitcheckout master
查看分支状态:
$git log --decorate --oneline
fdf2ea4 (HEAD -> master) add feature
7b7cf0b word game : first
切换到主分支后master, 上次修改的README.md文件:添加“power by tamir” 消失。
30.再次修改 MyProject2 中的README.md文件,添加“再次尝试!!!”之后添加到暂存区,提交到仓库。
图形化显示分支状态命令:
$git log --decorate --oneline --graph –all
示例:
$git log --decorate --oneline --graph –all
* 9cda795 (HEAD -> master) change the README file again
| * 0888d1d (feature) change the README file
|/
* fdf2ea4 add feature
* 7b7cf0b word game : first