第7章 分支

7.1 使用分支的原因

7.2 分支名

7.3 使用分支

7.4 创建分支

Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$ git branch prs/pr-1138

7.5 列出分支名

Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$ git branch* master  prs/pr-1138

7.6 查看分支

Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$ git show-branch* [master] Moved data to mydata ! [prs/pr-1138] Moved data to mydata--*+ [master] Moved data to mydata

7.7 检出分支

7.7.1 检出分支的一个简单例子

Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$ git branch* master  prs/pr-1138Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$ git checkout prs/pr-1138Switched to branch 'prs/pr-1138'Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (prs/pr-1138)$ git branch  master* prs/pr-1138

7.7.1 有未提交的更改时进行检出

Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$ cat mydataaaaaaaaAdministrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$ git diff mydatawarning: LF will be replaced by CRLF in mydata.The file will have its original line endings in your working directory.diff --git a/mydata b/mydataindex e69de29..e5a0c33 100644--- a/mydata+++ b/mydata@@ -0,0 +1 @@+aaaaaaaAdministrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$ git show master:mydataAdministrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$ git show prs/pr-1138 :mydatacommit 584e4ddff1996c76de2a31f134dfbfb086acf6fbAuthor: peter <[e-mail]>Date:   Tue Jul 4 22:25:28 2017 +0800    add mydatadiff --git a/mydata b/mydataindex e69de29..233e12a 100644--- a/mydata+++ b/mydata@@ -0,0 +1 @@+adfasfsdfAdministrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$ git add mydatawarning: LF will be replaced by CRLF in mydata.The file will have its original line endings in your working directory.Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$ git checkout masterAlready on 'master'M       mydataAdministrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$ git checkout prs/pr-1138error: Your local changes to the following files would be overwritten by checkout:        mydataPlease commit your changes or stash them before you switch branches.AbortingAdministrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$ git commit -m 'commit'[master 7c8dd0a] commit 1 file changed, 1 insertion(+)Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$ git checkout prs/pr-1138Switched to branch 'prs/pr-1138'Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (prs/pr-1138)$

7.7.3 合并变更到不同分支
如果使用-m选项特别要求，Git通过在你的本地修改和对目标分支之间进行一次合并操作，尝试将你的本地修改加入到新工作目录中。

Administrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (prs/pr-1138)$ git checkout -m masterSwitched to branch 'master'M       mydataAdministrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$ cat mydata<<<<<<< masteraaaaaaa=======adfasfsdfbbbbbbbbbbbbbbbbb>>>>>>> localAdministrator@BGUJ9QLXIRFWC3S MINGW32 /d/gittest/my_stuff (master)$

7.7.3 合并变更到不同分支

7.7.4 创建并检出新分支

7.7.5 分离HEAD分支

7.8 删除分支