GIT简介
1.GTI简介
- Git是目前世界上最先进的分布式版本控制系统(没有之一)
- Git官网:http://www.git-scm.com
- 把E:\Git\bin加入到环境变量里面就可以在命令行下使用了
- Git Bash打开之后可以模拟Linux命令(中文支持有点勉强)
- 集中式和分布式
集中式: - 先说集中式版本控制系统,版本库是集中存放在中央服务器的,而干活的时候,用的都是自己的电脑,所以要先从中央服务器取得最新的版本,然后开始干活,干完活了,再把自己的活推送给中央服务器。中央服务器就好比是一个图书馆,你要改一本书,必须先从图书馆借出来,然后回到家自己改,改完了,再放回图书馆。
- 集中式版本控制系统最大的毛病就是必须联网才能工作,如果在局域网内还好,带宽够大,速度够快,可如果在互联网上,遇到网速慢的话,可能提交一个10M的文件就需要5分钟,这还不得把人给憋死啊。
分布式: -
那分布式版本控制系统与集中式版本控制系统有何不同呢?首先,分布式版本控制系统根本没有“中央服务器”,每个人的电脑上都是一个完整的版本库,这样,你工作的时候,就不需要联网了,因为版本库就在你自己的电脑上。既然每个人电脑上都有一个完整的版本库,那多个人如何协作呢?比方说你在自己电脑上改了文件A,你的同事也在他的电脑上改了文件A,这时,你们俩之间只需把各自的修改推送给对方,就可以互相看到对方的修改了。
-
和集中式版本控制系统相比,分布式版本控制系统的安全性要高很多,因为每个人电脑里都有完整的版本库,某一个人的电脑坏掉了不要紧,随便从其他人那里复制一个就可以了。而集中式版本控制系统的中央服务器要是出了问题,所有人都没法干活了
-
在实际使用分布式版本控制系统的时候,其实很少在两人之间的电脑上推送版本库的修改,因为可能你们俩不在一个局域网内,两台电脑互相访问不了,也可能今天你的同事病了,他的电脑压根没有开机。因此,分布式版本控制系统通常也有一台充当“中央服务器”的电脑,但这个服务器的作用仅仅是用来方便“交换”大家的修改,没有它大家也一样干活,只是交换修改不方便而已。
- 弱化了服务器的功能,加强了个人的功能。
2、安装GIT
- 去官网下载安装
- 安装完成后,在开始菜单里找到“Git”->“Git Bash”,蹦出一个类似命令行窗口的东西,就说明Git安装成功!
- 然后进行下面的配置,就能在每次提交的时候跳过输入用户名和邮箱了
<code class="hljs ruby has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;"><span class="hljs-variable" style="color: rgb(102, 0, 102); box-sizing: border-box;">$ </span>git config --global user.name <span class="hljs-string" style="color: rgb(0, 136, 0); box-sizing: border-box;">"Your Name"</span> <span class="hljs-variable" style="color: rgb(102, 0, 102); box-sizing: border-box;">$ </span>git config --global user.email <span class="hljs-string" style="color: rgb(0, 136, 0); box-sizing: border-box;">"email@example.com"</span></code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li><li style="box-sizing: border-box; padding: 0px 5px;">2</li></ul>
3、创建版本库
- 什么是版本库:
- 什么是版本库呢?版本库又名仓库,英文名repository,你可以简单理解成一个目录,这个目录里面的所有文件都可以被Git管理起来,每个文件的修改、删除,Git都能跟踪,以便任何时刻都可以追踪历史,或者在将来某个时刻可以“还原”。
- 创建一个版本库非常简单、首先,选择一个合适的地方,创建一个空的目录:
- 首先确定不要有中文
$ git init
输入以上命令,把这个目录变成Git可以管理的仓库Initialized empty Git repository in D:/.git/
- 细心的读者可以发现当前目录下多了一个.git的目录,这个目录是Git来跟踪管理版本库的,没事千万不要手动修改这个目录里面的文件,不然改乱了,就把Git仓库给破坏了。
- 把文件夹添加到版本库
- 第一步 :用命令
git add
告诉Git,把文件添加到仓库
- 第一步 :用命令
<code class="hljs avrasm has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;">首先 touch readme<span class="hljs-preprocessor" style="color: rgb(68, 68, 68); box-sizing: border-box;">.txt</span> (创建readme文件) git <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">add</span> readme<span class="hljs-preprocessor" style="color: rgb(68, 68, 68); box-sizing: border-box;">.txt</span></code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li><li style="box-sizing: border-box; padding: 0px 5px;">2</li></ul>
-
- 第二步,用命令
git commit
告诉Git,把文件提交到仓库
- 第二步,用命令
<code class="hljs sql has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;"> git <span class="hljs-operator" style="box-sizing: border-box;"><span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">commit</span> -m <span class="hljs-string" style="color: rgb(0, 136, 0); box-sizing: border-box;">"wrote a readme file"</span></span></code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li></ul>
4、基本操作
基本操作
- git status 命令可以让我们时刻掌握仓库的当前状态
<code class="hljs livecodeserver has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;">$ git status On branch master <span class="hljs-comment" style="color: rgb(136, 0, 0); box-sizing: border-box;"> //当前的分支</span> nothing <span class="hljs-built_in" style="color: rgb(102, 0, 102); box-sizing: border-box;">to</span> commit, working <span class="hljs-built_in" style="color: rgb(102, 0, 102); box-sizing: border-box;">directory</span> clean</code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li><li style="box-sizing: border-box; padding: 0px 5px;">2</li><li style="box-sizing: border-box; padding: 0px 5px;">3</li></ul>
- git diff 顾名思义就是查看difference,显示的格式正式Unix通用的diff格式,可显示修改文件的内容
<code class="hljs applescript has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;">$ git diff readme.txt diff <span class="hljs-comment" style="color: rgb(136, 0, 0); box-sizing: border-box;">--git a/readme.txt b/readme.txt</span> index <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">80694</span>b3.<span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">.610</span>db72 <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">100644</span> <span class="hljs-comment" style="color: rgb(136, 0, 0); box-sizing: border-box;">--- a/readme.txt</span> +++ b/readme.txt @@ -<span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">6</span>,<span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">4</span> +<span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">6</span>,<span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">4</span> @@ asdfsdafsdfsdf adfasdfsd adfdsaf -asfasdfas \ No newline <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">at</span> <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">end</span> <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">of</span> <span class="hljs-type" style="box-sizing: border-box;">file</span> +asfasdfas123 </code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li><li style="box-sizing: border-box; padding: 0px 5px;">2</li><li style="box-sizing: border-box; padding: 0px 5px;">3</li><li style="box-sizing: border-box; padding: 0px 5px;">4</li><li style="box-sizing: border-box; padding: 0px 5px;">5</li><li style="box-sizing: border-box; padding: 0px 5px;">6</li><li style="box-sizing: border-box; padding: 0px 5px;">7</li><li style="box-sizing: border-box; padding: 0px 5px;">8</li><li style="box-sizing: border-box; padding: 0px 5px;">9</li><li style="box-sizing: border-box; padding: 0px 5px;">10</li><li style="box-sizing: border-box; padding: 0px 5px;">11</li><li style="box-sizing: border-box; padding: 0px 5px;">12</li><li style="box-sizing: border-box; padding: 0px 5px;">13</li></ul>
- git log 命令显示从最近到最远的提交日志
$ git log
commit 0f32004c37a6b8b49430f6d22a333470738de94b
Author: wuyinlei <1069584784@qq.com>
Date: Sat Apr 2 10:12:23 2016 +0800
第二次提交
commit 8bcb79e2f0c08c58c9cc37e7bfa11909fd0da1c7
Author: wuyinlei <1069584784@qq.com>
Date: Sat Apr 2 10:10:36 2016 +0800
第一次提交
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
- 11
- 12
- 13
- 14
- git log –pretty=oneline 显示为一行
<code class="hljs livecodeserver has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;">$ git <span class="hljs-built_in" style="color: rgb(102, 0, 102); box-sizing: border-box;">log</span> <span class="hljs-comment" style="color: rgb(136, 0, 0); box-sizing: border-box;">--pretty=oneline</span> <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">0</span>f32004c37a6b8b49430f6d22a333470738de94b 第二次提交 <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">8</span>bcb79e2f0c08c58c9cc37e7bfa11909fd0da1c7 第一次提交</code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li><li style="box-sizing: border-box; padding: 0px 5px;">2</li><li style="box-sizing: border-box; padding: 0px 5px;">3</li></ul>
- git reset –hard HEAD^ 加退到上一个版本,上上一个版本是HEAD^^,在多的话就写成HEAD-100
<code class="hljs applescript has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;">$ git reset <span class="hljs-comment" style="color: rgb(136, 0, 0); box-sizing: border-box;">--hard HEAD^</span> HEAD <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">is</span> now <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">at</span> <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">8</span>bcb79e 第一次提交 **这个时候在次查看就可以看到已经回退了** $ git <span class="hljs-command" style="box-sizing: border-box;">log</span> <span class="hljs-comment" style="color: rgb(136, 0, 0); box-sizing: border-box;">--pretty=oneline</span> <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">8</span>bcb79e2f0c08c58c9cc37e7bfa11909fd0da1c7 第一次提交 </code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li><li style="box-sizing: border-box; padding: 0px 5px;">2</li><li style="box-sizing: border-box; padding: 0px 5px;">3</li><li style="box-sizing: border-box; padding: 0px 5px;">4</li><li style="box-sizing: border-box; padding: 0px 5px;">5</li><li style="box-sizing: border-box; padding: 0px 5px;">6</li><li style="box-sizing: border-box; padding: 0px 5px;">7</li></ul>
- git reflog 查看命令历史,以便于确定要回到未来的哪个版本
<code class="hljs css has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;">$ <span class="hljs-tag" style="color: rgb(0, 0, 0); box-sizing: border-box;">git</span> <span class="hljs-tag" style="color: rgb(0, 0, 0); box-sizing: border-box;">reflog</span> 0<span class="hljs-tag" style="color: rgb(0, 0, 0); box-sizing: border-box;">f32004</span> <span class="hljs-tag" style="color: rgb(0, 0, 0); box-sizing: border-box;">HEAD</span><span class="hljs-at_rule" style="box-sizing: border-box;">@<span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">{0}:</span> commit: 第二次提交 <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">8</span>bcb79e HEAD@</span>{1}: <span class="hljs-tag" style="color: rgb(0, 0, 0); box-sizing: border-box;">commit</span> (<span class="hljs-tag" style="color: rgb(0, 0, 0); box-sizing: border-box;">initial</span>): 第一次提交 </code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li><li style="box-sizing: border-box; padding: 0px 5px;">2</li><li style="box-sizing: border-box; padding: 0px 5px;">3</li><li style="box-sizing: border-box; padding: 0px 5px;">4</li></ul>
- git reset –hard commit_id 在版本的历史之间穿梭
- git checkout –readme.txt意思就是:让这个文件回到最近一次git commit 或者git add 时的状态
- git rm test.txt 从版本库中删除改文件,并且git commit
- git checkout –test.txt 把误删的文件恢复到最新版本
分支管理
- 创建dev分支,然后切换到dev分支(dev是名字,可以随便取):
<code class="hljs lasso has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;">git branch dev git checkout dev 或者 git checkout <span class="hljs-attribute" style="box-sizing: border-box;">-b</span> dev <span class="hljs-comment" style="color: rgb(136, 0, 0); box-sizing: border-box;">//-b参数表示创建并切换</span> <span class="hljs-comment" style="color: rgb(136, 0, 0); box-sizing: border-box;">//以下的就是查看创建的分支</span> 若兰@DESKTOP<span class="hljs-attribute" style="box-sizing: border-box;">-HNR0QUU</span> MINGW64 /d/wuyinlei (master) $ git checkout <span class="hljs-attribute" style="box-sizing: border-box;">-b</span> dev Switched <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">to</span> a <span class="hljs-literal" style="color: rgb(0, 102, 102); box-sizing: border-box;">new</span> branch <span class="hljs-string" style="color: rgb(0, 136, 0); box-sizing: border-box;">'dev'</span> 若兰@DESKTOP<span class="hljs-attribute" style="box-sizing: border-box;">-HNR0QUU</span> MINGW64 /d/wuyinlei (dev) $ git checkout dev Already <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">on</span> <span class="hljs-string" style="color: rgb(0, 136, 0); box-sizing: border-box;">'dev'</span> </code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li><li style="box-sizing: border-box; padding: 0px 5px;">2</li><li style="box-sizing: border-box; padding: 0px 5px;">3</li><li style="box-sizing: border-box; padding: 0px 5px;">4</li><li style="box-sizing: border-box; padding: 0px 5px;">5</li><li style="box-sizing: border-box; padding: 0px 5px;">6</li><li style="box-sizing: border-box; padding: 0px 5px;">7</li><li style="box-sizing: border-box; padding: 0px 5px;">8</li><li style="box-sizing: border-box; padding: 0px 5px;">9</li><li style="box-sizing: border-box; padding: 0px 5px;">10</li><li style="box-sizing: border-box; padding: 0px 5px;">11</li><li style="box-sizing: border-box; padding: 0px 5px;">12</li><li style="box-sizing: border-box; padding: 0px 5px;">13</li><li style="box-sizing: border-box; padding: 0px 5px;">14</li><li style="box-sizing: border-box; padding: 0px 5px;">15</li><li style="box-sizing: border-box; padding: 0px 5px;">16</li></ul>
- git branch命令查看当前分支
<code class="hljs ruby has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;"><span class="hljs-variable" style="color: rgb(102, 0, 102); box-sizing: border-box;">$ </span>git branch * dev master</code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li><li style="box-sizing: border-box; padding: 0px 5px;">2</li><li style="box-sizing: border-box; padding: 0px 5px;">3</li></ul>
//现在可以在dev分支上修改或者提交内容了,当切换回master分支后是无法查看dev分支修改的内容的
git checkout master
$ git checkout dev
Switched to branch 'dev'
若兰@DESKTOP-HNR0QUU MINGW64 /d/wuyinlei (dev)
$ echo "dev modefi">>readme.txt
若兰@DESKTOP-HNR0QUU MINGW64 /d/wuyinlei (dev)
$ cat readme.txt
dev modefi
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
- 当我们执行以下的语句的时候,可以看到我们在dev分支上提交,但是如果没有提交到master上,在master上是没有数据的,跟master没有关系
<code class="hljs mel has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;">$ git add readme.txt <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">warning</span>: LF will be replaced by CRLF <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">in</span> readme.txt. The <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">file</span> will have its original line endings <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">in</span> your working directory. 若兰<span class="hljs-variable" style="color: rgb(102, 0, 102); box-sizing: border-box;">@DESKTOP</span>-HNR0QUU MINGW64 /d/wuyinlei (dev) $ git commit -m <span class="hljs-string" style="color: rgb(0, 136, 0); box-sizing: border-box;">"branch dev"</span> [dev <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">warning</span>: LF will be replaced by CRLF <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">in</span> readme.txt. The <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">file</span> will have its original line endings <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">in</span> your working directory. <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">16</span>fd01f] branch dev <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">warning</span>: LF will be replaced by CRLF <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">in</span> readme.txt. The <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">file</span> will have its original line endings <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">in</span> your working directory. <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">1</span> <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">file</span> changed, <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">1</span> insertion(+) 若兰<span class="hljs-variable" style="color: rgb(102, 0, 102); box-sizing: border-box;">@DESKTOP</span>-HNR0QUU MINGW64 /d/wuyinlei (dev) $ cat readme.txt dev modefi 若兰<span class="hljs-variable" style="color: rgb(102, 0, 102); box-sizing: border-box;">@DESKTOP</span>-HNR0QUU MINGW64 /d/wuyinlei (dev) $ git checkout master Switched to branch <span class="hljs-string" style="color: rgb(0, 136, 0); box-sizing: border-box;">'master'</span> 若兰<span class="hljs-variable" style="color: rgb(102, 0, 102); box-sizing: border-box;">@DESKTOP</span>-HNR0QUU MINGW64 /d/wuyinlei (master) $ cat readme.txt </code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li><li style="box-sizing: border-box; padding: 0px 5px;">2</li><li style="box-sizing: border-box; padding: 0px 5px;">3</li><li style="box-sizing: border-box; padding: 0px 5px;">4</li><li style="box-sizing: border-box; padding: 0px 5px;">5</li><li style="box-sizing: border-box; padding: 0px 5px;">6</li><li style="box-sizing: border-box; padding: 0px 5px;">7</li><li style="box-sizing: border-box; padding: 0px 5px;">8</li><li style="box-sizing: border-box; padding: 0px 5px;">9</li><li style="box-sizing: border-box; padding: 0px 5px;">10</li><li style="box-sizing: border-box; padding: 0px 5px;">11</li><li style="box-sizing: border-box; padding: 0px 5px;">12</li><li style="box-sizing: border-box; padding: 0px 5px;">13</li><li style="box-sizing: border-box; padding: 0px 5px;">14</li><li style="box-sizing: border-box; padding: 0px 5px;">15</li><li style="box-sizing: border-box; padding: 0px 5px;">16</li><li style="box-sizing: border-box; padding: 0px 5px;">17</li><li style="box-sizing: border-box; padding: 0px 5px;">18</li><li style="box-sizing: border-box; padding: 0px 5px;">19</li><li style="box-sizing: border-box; padding: 0px 5px;">20</li><li style="box-sizing: border-box; padding: 0px 5px;">21</li><li style="box-sizing: border-box; padding: 0px 5px;">22</li><li style="box-sizing: border-box; padding: 0px 5px;">23</li><li style="box-sizing: border-box; padding: 0px 5px;">24</li></ul>
- 把dev分支的工作成果合并到master分支上:
git merge dev
<code class="hljs livecodeserver has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;">$ git <span class="hljs-built_in" style="color: rgb(102, 0, 102); box-sizing: border-box;">merge</span> dev Updating <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">8</span>bcb79e.<span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">.16</span>fd01f Fast-forward readme.txt | <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">1</span> + <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">1</span> <span class="hljs-built_in" style="color: rgb(102, 0, 102); box-sizing: border-box;">file</span> changed, <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">1</span> insertion(+) <span class="hljs-comment" style="color: rgb(136, 0, 0); box-sizing: border-box;"> //这个时候在查看,就已经合并了</span> $ cat readme.txt dev modefi </code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li><li style="box-sizing: border-box; padding: 0px 5px;">2</li><li style="box-sizing: border-box; padding: 0px 5px;">3</li><li style="box-sizing: border-box; padding: 0px 5px;">4</li><li style="box-sizing: border-box; padding: 0px 5px;">5</li><li style="box-sizing: border-box; padding: 0px 5px;">6</li><li style="box-sizing: border-box; padding: 0px 5px;">7</li><li style="box-sizing: border-box; padding: 0px 5px;">8</li><li style="box-sizing: border-box; padding: 0px 5px;">9</li><li style="box-sizing: border-box; padding: 0px 5px;">10</li></ul>
- 删除分支:
git branch -d dev
<code class="hljs smalltalk has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;"><span class="hljs-char" style="box-sizing: border-box;">$ </span>git branch -d dev <span class="hljs-class" style="box-sizing: border-box; color: rgb(102, 0, 102);">Deleted</span> branch dev (was <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">16</span>fd01f). //在查看,就只有master一个主分支了 <span class="hljs-char" style="box-sizing: border-box;">$ </span>git branch * master</code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li><li style="box-sizing: border-box; padding: 0px 5px;">2</li><li style="box-sizing: border-box; padding: 0px 5px;">3</li><li style="box-sizing: border-box; padding: 0px 5px;">4</li><li style="box-sizing: border-box; padding: 0px 5px;">5</li><li style="box-sizing: border-box; padding: 0px 5px;">6</li></ul>
5、GIT与GitHub
- 作为开源代码库以及版本控制系统,GitHub拥有150多万开发者用户,随着越来越多的应用程序转移到了云上,GitHub已经成为了管理软件开发以及发现已有代码的首选方法。
搭建远程版本库
- 第一步:https://github.com/ 进入注册自己的账号
- 第二步:创建版本库
- 第三步:查看建立好的版本库
- 生成秘钥
<code class="hljs lasso has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;">ssh<span class="hljs-attribute" style="box-sizing: border-box;">-keygen</span> <span class="hljs-attribute" style="box-sizing: border-box;">-t</span> rsa <span class="hljs-attribute" style="box-sizing: border-box;">-C</span><span class="hljs-string" style="color: rgb(0, 136, 0); box-sizing: border-box;">"email.com"</span></code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li></ul>
查看秘钥:
把出来的秘钥复制到github上:
把生成的秘钥:添加到github上
* 在.ssh\目录下创建一个config文件,内容如下:
<code class="hljs avrasm has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;">Host github<span class="hljs-preprocessor" style="color: rgb(68, 68, 68); box-sizing: border-box;">.com</span> User git Hostname ssh<span class="hljs-preprocessor" style="color: rgb(68, 68, 68); box-sizing: border-box;">.github</span><span class="hljs-preprocessor" style="color: rgb(68, 68, 68); box-sizing: border-box;">.com</span> PreferredAuthentications publickey IdentityFile~/<span class="hljs-preprocessor" style="color: rgb(68, 68, 68); box-sizing: border-box;">.ssh</span>/id_rsa Port <span class="hljs-number" style="color: rgb(0, 102, 102); box-sizing: border-box;">443</span> 测试通过 ssh -t git@github<span class="hljs-preprocessor" style="color: rgb(68, 68, 68); box-sizing: border-box;">.com</span> 或者 ssh -T git@github<span class="hljs-preprocessor" style="color: rgb(68, 68, 68); box-sizing: border-box;">.com</span></code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li><li style="box-sizing: border-box; padding: 0px 5px;">2</li><li style="box-sizing: border-box; padding: 0px 5px;">3</li><li style="box-sizing: border-box; padding: 0px 5px;">4</li><li style="box-sizing: border-box; padding: 0px 5px;">5</li><li style="box-sizing: border-box; padding: 0px 5px;">6</li><li style="box-sizing: border-box; padding: 0px 5px;">7</li><li style="box-sizing: border-box; padding: 0px 5px;">8</li><li style="box-sizing: border-box; padding: 0px 5px;">9</li><li style="box-sizing: border-box; padding: 0px 5px;">10</li><li style="box-sizing: border-box; padding: 0px 5px;">11</li></ul>
以上的我没有测试通过,,,,
下面来看下我自己的push推送吧
我们复制好这里面的地址,然后用GitBash切换到你的项目根目录下
输入以下的命令
<code class="hljs php has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;">$ git <span class="hljs-keyword" style="color: rgb(0, 0, 136); box-sizing: border-box;">clone</span> https:<span class="hljs-comment" style="color: rgb(136, 0, 0); box-sizing: border-box;">//github.com/wuyinlei/loadermanager.git</span> 这个时候,就会在这个目录下创建本地版本库</code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li><li style="box-sizing: border-box; padding: 0px 5px;">2</li><li style="box-sizing: border-box; padding: 0px 5px;">3</li></ul>
这个时候我们自己进入到这个目录的根目录下:
然后我们进入这个目录下,把里面的文件剪切出来放到项目根目录下,这个时候删除那个空的文件夹
这个时候在Git Bash上,还是切换到项目的根目录下,输入以下的命令:
<code class="hljs ruby has-numbering" style="display: block; padding: 0px; color: inherit; box-sizing: border-box; font-family: 'Source Code Pro', monospace;font-size:undefined; white-space: pre; border-radius: 0px; word-wrap: normal; background: transparent;"><span class="hljs-variable" style="color: rgb(102, 0, 102); box-sizing: border-box;">$ </span>git add . (.代表着同步全部) <span class="hljs-variable" style="color: rgb(102, 0, 102); box-sizing: border-box;">$ </span>git commit -m <span class="hljs-string" style="color: rgb(0, 136, 0); box-sizing: border-box;">"一个简单的介绍loader加载器"</span> (<span class="hljs-string" style="color: rgb(0, 136, 0); box-sizing: border-box;">""</span>这里面添加注释) <span class="hljs-variable" style="color: rgb(102, 0, 102); box-sizing: border-box;">$ </span>git push origin master 提交到远程版本库 这个时候要输入用户名和密码,输入自己的用户名和密码,接着enter按键。 </code><ul class="pre-numbering" style="box-sizing: border-box; position: absolute; width: 50px; top: 0px; left: 0px; margin: 0px; padding: 6px 0px 40px; border-right-width: 1px; border-right-style: solid; border-right-color: rgb(221, 221, 221); list-style: none; text-align: right; background-color: rgb(238, 238, 238);"><li style="box-sizing: border-box; padding: 0px 5px;">1</li><li style="box-sizing: border-box; padding: 0px 5px;">2</li><li style="box-sizing: border-box; padding: 0px 5px;">3</li><li style="box-sizing: border-box; padding: 0px 5px;">4</li><li style="box-sizing: border-box; padding: 0px 5px;">5</li></ul>
这个时候我们在次刷新网页,可以看到我们的代码已经同步到了github上面:
至此,这个时候我们已经完成了本地和远程库的同步。
参考文档:廖雪峰的Git教程:
http://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000