继续上篇Git基础教程（一），在开篇之前，先回顾一下上篇中的基本命令。
配置命令：git config --global *
版本库初始化：git init
向版本库添加文件：git add *
提交文件：git commit *
查看状态：git status
查看修改详情：git diff *
查看日志：git log (*)
恢复版本：git reset *
撤销：git checkout -- *
删除：git rm * 配置github：ssh-keygen -t rsa -C "******@163.com"
添加远程库：git remote add *
调试：ssh -T -v git@github.com
查询远程库：git remote -v
删除远程库文件：
git rm -f gitReadme.md
git commit -m "delete file Gitreadme.md" --先删除本地库
git push origin master
删除远程库：git remote remove origin
克隆远程库：git clone *
（续）4，分支管理
1）查看当前分支
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git branch
* master
2）创建并切换
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git branch dev zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git checkout dev
Switched to branch 'dev'
等价语句：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git checkout -b working
Switched to a new branch 'working'
git branch命令会列出所有分支，当前分支前面会标一个*号。 3）合并分支工作成果
在working分支添加一个readme.md
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (working)
$ git add readme.md zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (working)
$ git commit -m 'add readme.md'
[working 59dc0fe] add readme.md
1 file changed,16 insertions(+)
create mode 100644 readme.md
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (working)
$ cat readme.md
----------
# 数据结构学习笔记 #
>**本笔记来自学习《数据结构与算法.严蔚敏（48集）》视频，[数据结构(C语言版)].严蔚敏_吴伟民.扫描版.pdf。** ----------
# 第01章 绪论 #
## 学习要点 ##
1.熟悉各名词、术语的含义，掌握基本概念；
2.理解算法五个要素的确切含义；
3.掌握计算语句频度和估算算法时间复杂度的方法。
## 代码块 ##
-矩阵乘法
-选择排序
-冒泡排序 zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ cat readme.md
cat: readme.md:No such file or directory
把working上的工作成果合并到master上来：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git merge working
Updating b460b3f..59dc0fe
Fast-forward
readme.md |16++++++++++++++++
1 file changed,16 insertions(+)
create mode 100644 readme.md
删除分支：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git branch -d dev
Deleted branch dev (was b460b3f).
强行删除分支：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git branch -d working
error:The branch 'working' is not fully merged.
If you are sure you want to delete it, run 'git branch -D working'.
遇到问题如下：
分析：
任务未完成。解决：
小结：往远程库添加一个文件的步骤如下：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git add readme.md zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git commit -m "add a reame.md file."
[master b6fc772] add a reame.md file.
1 file changed,17 insertions(+)
create mode 100644 readme.md zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git pull --rebase origin master
remote:Counting objects:2,done.
remote:Compressing objects:100%(2/2),done.
remote:Total2(delta 1), reused 0(delta 0), pack-reused 0
Unpacking objects:100%(2/2),done.
From github.com:zhangbc/dataStructure
* branch master -> FETCH_HEAD
6fb284c..8366817 master -> origin/master
First, rewinding head to replay your work on top of it...
Applying: add a reame.md file.
Applying:数据结构学习笔记 by zhangbc
Applying: add a reame.md file. zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git push origin master
Counting objects:6,done.
Delta compression using up to 4 threads.
Compressing objects:100%(6/6),done.
Writing objects:100%(6/6),604 bytes |0 bytes/s,done.
Total6(delta 4), reused 0(delta 0)
remote:Resolving deltas:100%(4/4), completed with 2local objects.
To github.com:zhangbc/dataStructure.git
8366817..da420b4 master -> master
4）解决冲突
在分支dev提交gitReadme.md：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ cat gitReadme.md
# gitReadme #
----------
Creating a new branch is quick and simple.(Dev) zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git add gitReadme.md zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git commit -m "Add gitReadme.md"
[dev 366500d]Add gitReadme.md
1 file changed,4 insertions(+)
create mode 100644 gitReadme.md
切换到主分支master上：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git checkout master
Switched to branch 'master'
M readme.md
Your branch is ahead of 'origin/master' by 3 commits.
(use "git push" to publish your local commits) zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$
在分支master修改并提交gitReadme.md：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ cat gitReadme.md
# gitReadme #
----------
Change a main branch of master is quick and simple.(Master) zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git add gitReadme.md zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git commit -m "Add gitReadme.md"
[master b466603]Add gitReadme.md
1 file changed,4 insertions(+)
create mode 100644 gitReadme.md
合并：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git merge dev
Auto-merging gitReadme.md
CONFLICT (add/add):Merge conflict in gitReadme.md
Automatic merge failed; fix conflicts and then commit the result.
查看文档：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master|MERGING)
$ cat gitReadme.md
# gitReadme # ----------
<<<<<<< HEAD
Change a main branch of master is quick and simple.(Master)
======= Creating a new branch is quick and simple.(Dev)
>>>>>>> dev
手动解决：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master|MERGING)
$ vi gitReadme.md
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master|MERGING)
$ cat gitReadme.md
# gitReadme #
---------- Change a main branch of master is quick and simple.(Master)
----------
Creating a new branch is quick and simple.(Dev) zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master|MERGING)
$ git add gitReadme.md zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master|MERGING)
$ git commit -m "Add gitReadme.md confict fixed."
[master 8e59a4d]Add gitReadme.md confict fixed. zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$
查看日志：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git log --graph --pretty=oneline --abbrev-commit
5）分支管理策略
通常，合并分支时，如果可能，Git会用
Fast forward模式，但这种模式下，删除分支后，会丢掉分支信息。如果要强制禁用Fast forward模式，Git就会在merge时生成一个新的commit，这样，从分支历史上就可以看出分支信息。 创建分支dev并切换，添加文件：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git checkout -b dev
Switched to a new branch 'dev' zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ cat gitReadme.md
# gitReadme #
----------
Creating a new branch with --no-ff is quick and simple.(Dev) zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git add gitReadme.md zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git commit -m 'Add merge with --no-ff.'
[dev 49afeab]Add merge with --no-ff.
1 file changed,1 insertion(+),4 deletions(-)
切换到主分支master上，并合并：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 6 commits.
(use "git push" to publish your local commits) zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git merge --no-ff -m "Merge with no-ff." dev
Merge made by the 'recursive' strategy.
gitReadme.md |5+----
1 file changed,1 insertion(+),4 deletions(-)
查看日志：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git log --graph --pretty=oneline --abbrev-commit
在实际开发中，我们应该按照几个基本原则进行分支管理：
首先，master分支应该是非常稳定的，也就是仅用来发布新版本，平时不能在上面干活；干活都在dev分支上，也就是说，dev分支是不稳定的，到某个时候，比如1.0版本发布时，再把dev分支合并到master上，在master分支发布1.0版本；每个人都在dev分支上干活，每个人都有自己的分支，时不时地往dev分支上合并即可。
5，多人协作
1）bug分支
Git还提供了一个
stash功能，可以把当前工作现场“储藏”起来，等以后恢复现场后继续工作。zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git branch
* dev
master zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git status
On branch 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: readme.md no changes added to commit (use "git add" and/or "git commit -a") zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git stash
Saved working directory and index state WIP on dev:49afeabAdd merge with --no-ff.
HEAD is now at 49afeabAdd merge with --no-ff. zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 10 commits.
(use "git push" to publish your local commits) zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git checkout -b issue-101
Switched to a new branch 'issue-101' zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (issue-101)
$ git add readme.md zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (issue-101)
$ git commit -m "fix bug 101"
On branch issue-101
nothing to commit, working tree clean zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (issue-101)
$ git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 10 commits.
(use "git push" to publish your local commits) zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git merge --no-ff -m "merge bug fix 101" issue-101
Already up-to-date. zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git branch -d issue-101
Deleted branch issue-101(was c182956). zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git checkout dev
Switched to branch 'dev' zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git status
On branch dev
nothing to commit, working tree clean zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git stash list
stash@{0}: WIP on dev:49afeabAdd merge with --no-ff. zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git stash pop
On branch 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: readme.md no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0}(ab63aa01e37e908d49ab921656884b29b17aeac1) zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git stash list zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
2）feature分支
开发一个新feature，最好新建一个分支；如果要丢弃一个没有被合并过的分支，可以通过
git branch -D <name>强行删除。 3）多人协作
查看远程库信息：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git remote
origin zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git remote -v
origin git@github.com:zhangbc/dataStructure.git (fetch)
origin git@github.com:zhangbc/dataStructure.git (push)
推送分支：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git push origin dev
Counting objects:20,done.
Delta compression using up to 4 threads.
Compressing objects:100%(20/20),done.
Writing objects:100%(20/20),1.81KiB|0 bytes/s,done.
Total20(delta 12), reused 0(delta 0)
remote:Resolving deltas:100%(12/12), completed with 2local objects.
To github.com:zhangbc/dataStructure.git
*[new branch] dev -> dev
推送原则：
(1)master分支是主分支，因此要时刻与远程同步；
(2)dev分支是开发分支，团队所有成员都需要在上面工作，所以也需要与远程同步；(3)bug分支只用于在本地修复bug；(4)feature分支是否推到远程，取决于合作开发。
抓取分支：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (dev)
$ git clone git@github.com:zhangbc/PythonWorking.git
Cloning into 'PythonWorking'...
remote:Counting objects:90,done.
remote:Compressing objects:100%(2/2),done.
remote:Total90(delta 0), reused 0(delta 0), pack-reused 88
Receiving objects:100%(90/90),18.55KiB|6.00KiB/s,done.
Resolving deltas:100%(47/47),done.
6，标签管理
发布一个版本时，我们通常先在版本库中打一个标签（tag），这样，就唯一确定了打标签时刻的版本。将来无论什么时候，取某个标签的版本，就是把那个打标签的时刻的历史版本取出来。所以，标签也是版本库的一个快照。
创建标签：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git tag V1.0
查看标签：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git tag
V1.0
补打标签，先查找commit id：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git log --pretty=oneline --abbrev-commit
c182956 merge bug fix 101
2fd9cb4 fix bug 101
ffb5db6 Merge with no-ff.
49afeabAdd merge with --no-ff.
8e59a4dAdd gitReadme.md confict fixed.
b466603 Add gitReadme.md
366500dAdd gitReadme.md
63b712aMerge branch 'dev'
4d28e6d an example
6da4fcd an example
da420b4 add a reame.md file.
cfce135 数据结构学习笔记 by zhangbc
5433fd9 add a reame.md file.
8366817Delete README.md
6fb284c数据结构学习笔记 by zhangbc
ac69d7d 数据结构学习笔记 by zhangbc
bde6080 add readme.md
39013c9Create README.md
b460b3f 数据结构学习笔记 by zhangbc zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git tag v0.1 da420b4
查看标签详情：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git show V1.0
commit c182956d8cf80b393b18027cc6bb010481aeae40
Merge: ffb5db6 2fd9cb4
Author: zhangbc <zhangbochengcheng189@163.com>
Date:MonMar616:47:202017+0800 merge bug fix 101
创建带有说明的标签：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git tag -a V0.2-m "Version 0.1 released"5433fd9
另外，创建带私钥签名的标签（配置略过）：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git tag -s -a V0.3-m "Version 0.3 released"
删除标签：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git tag -d show
Deleted tag 'show'(was c182956)
推送标签：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git push origin V0.2
Counting objects:1,done.
Writing objects:100%(1/1),168 bytes |0 bytes/s,done.
Total1(delta 0), reused 0(delta 0)
To github.com:zhangbc/dataStructure.git
*[new tag] V0.2-> V0.2 zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git push origin --tag
Total0(delta 0), reused 0(delta 0)
To github.com:zhangbc/dataStructure.git
*[new tag] V1.0-> V1.0
*[new tag] v0.1-> v0.1
删除远程库标签：
zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git tag -d V0.2
Deleted tag 'V0.2'(was 30a96b6) zhangbc@working MINGW64 /d/BaiduYunDownload/dataStructure (master)
$ git push origin :refs/tags/V0.2
To github.com:zhangbc/dataStructure.git
-[deleted]V0.2
7，自定义Git
让Git显示不同的颜色：
Administrator@WIN-9S4D59CISAA MINGW64 ~(master)
$ git config --global color.ui true
在Git工作区的根目录下创建一个特殊的.gitignore文件，然后把要忽略的文件名填进去，Git就会自动忽略这些文件。
配置别名：
Administrator@WIN-9S4D59CISAA MINGW64 /e/DataStructure/dataStructure (master)
$ git config --global alias.st status Administrator@WIN-9S4D59CISAA MINGW64 /e/DataStructure/dataStructure (master)
$ git st
On branch master
nothing to commit, working tree clean
Administrator@WIN-9S4D59CISAA MINGW64 /e/DataStructure/dataStructure (master)
$ git config --global alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit" Administrator@WIN-9S4D59CISAA MINGW64 /e/DataStructure/dataStructure (master)
$ git lg
*53aad04-(HEAD -> master, origin/master) C++ ignore file.(21 minutes ago)<zhangbc>
* c28d67e -本笔记系统说明文件 by zhangbc (35 minutes ago)<zhangbc>
* b797aab - delete file readmeBug.md (38 minutes ago)<zhangbc>
*20828c2- delete file Gitreadme.md (44 minutes ago)<zhangbc>
配置Git的时候，加上--global是针对当前用户起作用的，如果不加，那只针对当前仓库起作用。
每个仓库的配置文件：
Administrator@WIN-9S4D59CISAA MINGW64 /e/DataStructure/dataStructure (master)
$ cat .git/config
[core]
repositoryformatversion =0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
[remote "origin"]
url = git@github.com:zhangbc/dataStructure.git
fetch =+refs/heads/*:refs/remotes/origin/*
当前用户的配置文件：
Administrator@WIN-9S4D59CISAA MINGW64 ~(master)
$ cat .gitconfig
[user]
name = *****
email = **********@163.com
[color]
ui = true
[alias]
st = status
g = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'--abbrev-commit
最后，Git基础入门知识，到此已基本完成，欢迎各位拍砖！