-
Notifications
You must be signed in to change notification settings - Fork 0
/
git_bash.html
243 lines (224 loc) · 12.3 KB
/
git_bash.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
<!DOCTYPE html>
<html lang="zh_cn">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="本文简介： 节选自https://www.cnblogs.com/chenwolong/p/GIT.html 原文实在太多，对我来说不符合常用的标准，不方便查阅 所以只节选一部分自己常用的作为笔记方便以后查看 一、新建工程 > 在[当前路径|新建路径]新建一个Git代码库 git init [|project-name] 二、克隆工程 > 克隆url的master分支到当前路径下 git...">
<meta name="keywords" content="git">
<link rel="icon" href="./favicon.ico">
<title>git常用命令 - Rivarrl</title>
<!-- Stylesheets -->
<link href="./css/all.min.css" rel="stylesheet">
<!-- /Stylesheets -->
<!-- RSS Feeds -->
<!-- /RSS Feeds -->
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<!-- mathjax config similar to math.stackexchange -->
<script type="text/x-mathjax-config">
MathJax.Hub.Config({
jax: ["input/TeX", "output/HTML-CSS"],
tex2jax: {
inlineMath: [ ['$', '$'] ],
displayMath: [ ['$$', '$$']],
processEscapes: true,
skipTags: ['script', 'noscript', 'style', 'textarea', 'pre', 'code']
},
messageStyle: "none",
"HTML-CSS": { preferredFont: "TeX", availableFonts: ["STIX","TeX"] }
});
</script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
</head>
<body>
<!-- Header -->
<div class="header-container" style="background: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)), url('./images/background.jpg'); background-position: center; background-size: cover;">
<!-- Static navbar -->
<div class="container">
<div class="header-nav">
<div class="header-logo">
<a class="pull-left" href="./"><img class="mr20" src="./images/logo.png" alt="logo">Rivarrl</a>
</div>
<div class="nav pull-right">
<a href="./">Homepage</a>
<a href="./categories.html">Categories</a>
</div>
</div>
</div>
<!-- /Static navbar -->
<!-- Header -->
<!-- Header -->
<div class="container header-wrapper">
<div class="row">
<div class="col-lg-12">
<div class="header-content">
<h1 class="header-title">git常用命令</h1>
<p class="header-date">By <a href="./author/rivarrl.html">Rivarrl</a>, 2018-09-28 00:29:00, modified 2018-09-28 00:29:00, in category <a href="./category/notes.html">Notes</a></p>
<div class="header-underline"></div>
<div class="clearfix"></div>
<p class="pull-right header-tags">
<span class="glyphicon glyphicon-tags mr5" aria-hidden="true"></span>
<a href="./tag/git.html">git</a> </p>
</div>
</div>
</div>
</div>
<!-- /Header -->
<!-- /Header -->
</div>
<!-- /Header -->
<!-- Content -->
<div class="container content">
<p><font size=5 face="黑体">本文简介：
<br/>节选自https://www.cnblogs.com/chenwolong/p/GIT.html
<br/>原文实在太多，对我来说不符合常用的标准，不方便查阅
<br/>所以只节选一部分自己常用的作为笔记方便以后查看</font></p>
<hr>
<p><font size=5 face="黑体"> 一、新建工程</font></p>
<h4>> 在[当前路径|新建路径]新建一个Git代码库</h4>
<p><pre><font size=4 face="verdana">git init [|project-name]</font></pre></p>
<p><br> </p>
<p><font size=5 face="黑体"> 二、克隆工程</font> </p>
<h4>> 克隆url的master分支到当前路径下</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git clone [url]</font></pre> </p>
<h4>> 下载一个项目的指定分支</h4>
<p><pre><font size=4 face="verdana">git clone -b [branch] [url]</font></pre></p>
<p><br> </p>
<p><font size=5 face="黑体"> 二、增删文件</font> </p>
<h4>> 添加指定文件到暂存区</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git add [file1] [file2] …</font></pre> </p>
<h4>> 添加指定目录到暂存区，包括子目录</h4>
<p><pre><font size=4 face="verdana">git add [dir]</font></pre></p>
<h4>> 添加当前目录的所有文件到暂存区</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git add .</font></pre> </p>
<h4>> 删除工作区文件，并且将这次删除放入暂存区</h4>
<p><pre><font size=4 face="verdana">git rm [file1] [file2] …</font></pre></p>
<h4>> 改名文件，并且将这个改名放入暂存区</h4>
<p><pre><font size=4 face="verdana">git mv [file-original] [file-renamed]</font></pre></p>
<p><br>
<font size=5 face="黑体"> 三、代码提交</font> </p>
<h4>> 提交暂存区到仓库区</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git commit -m [message]</font></pre> </p>
<h4>> 提交暂存区的指定文件到仓库区</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git commit [file1] [file2] … -m [message]</font></pre> </p>
<h4>> 提交工作区自上次commit之后的变化，直接到仓库区</h4>
<p><pre><font size=4 face="verdana">git commit -a</font></pre></p>
<h4>> 提交时显示所有diff信息</h4>
<p><pre><font size=4 face="verdana">git commit -v</font></pre></p>
<h4>> 使用一次新的commit，替代上一次提交</h4>
<p>– 如果代码没有任何新变化，则用来改写上一次commit的提交信息
<pre><font size=4 face="verdana">git commit –amend -m [message]</font></pre></p>
<p><br>
<font size=5 face="黑体"> 四、分支</font> </p>
<h4>> 列出[本地|远程|所有]分支</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git branch [|-r|-a]</font></pre> </p>
<h4>> 新建一个分支，但依然停留在当前分支</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git branch [branch-name]</font></pre> </p>
<h4>> 新建一个分支，并切换到该分支</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git checkout -b [branch]</font></pre> </p>
<h4>> 切换到指定分支，并更新工作区</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git checkout [branch-name]</font></pre> </p>
<h4>> 切换到上一个分支</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git checkout -</font></pre> </p>
<h4>> 建立追踪关系，在现有分支与指定的远程分支之间</h4>
<p><pre><font size=4 face="verdana">git branch –set-upstream [branch] [remote-branch]</font></pre></p>
<h4>> 合并指定分支到当前分支</h4>
<p><pre><font size=4 face="verdana">git merge [branch]</font></pre></p>
<h4>> 删除分支</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git branch -d [branch-name]</font></pre> </p>
<p><br>
<font size=5 face="黑体"> 五、远程操作</font> </p>
<h4>> 取回远程仓库的变化，并与本地分支合并</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git pull [remote] [branch]</font></pre></p>
<h4>> 上传本地指定分支到远程仓库</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git push [remote] [branch]</font></pre></p>
<h4>> 更新远程仓储</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git remote update</font></pre></p>
<h4>> 重置暂存区与工作区，与上一次commit保持一致</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git reset –hard</font></pre></p>
<p><br>
<font size=5 face="黑体"> 六、查看信息</font></p>
<h4>> 显示有变更的文件</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git status</font></pre></p>
<h4>> 显示当前分支的版本历史</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git log</font></pre></p>
<h4>> 显示暂存区和工作区的代码差异</h4>
<p><pre><font color=#0099ff size=4 face="verdana">git diff</font></pre></p>
<h4>> 显示今天你写了多少行代码</h4>
<p><pre><font size=4 face="verdana">git diff –shortstat “@{0 day ago}”</font></pre></p>
<h4>> 显示某次提交的元数据和内容变化</h4>
<p><pre><font size=4 face="verdana">git show [commit]</font></pre></p>
<h4>> 显示当前分支的最近几次提交</h4>
<p><pre><font size=4 face="verdana">git reflog</font></pre></p>
<h4>> 从本地master拉取代码更新当前分支：branch 一般为master</h4>
<p><pre><font size=4 face="verdana">git rebase [branch]</font></pre></p>
</div>
<!-- /Content -->
<!-- Footer -->
<div class="footer gradient-2">
<div class="container footer-container ">
<div class="row">
<div class="col-xs-4 col-sm-3 col-md-3 col-lg-3">
<div class="footer-title">Sitemap</div>
<ul class="list-unstyled">
<li><a href="./archives.html">Archives</a></li>
<li><a href="./tags.html">Tags</a></li>
<li><a href="./authors.html">Authors</a></li>
</ul>
</div>
<div class="col-xs-4 col-sm-3 col-md-3 col-lg-3">
<div class="footer-title">Social</div>
<ul class="list-unstyled">
<li><a href="tencent://message/?uin=1049793871&Site=Sambow&Menu=yes" target="_blank">QQ</a></li>
<li><a href="http://github.com/Rivarrl" target="_blank">GitHub</a></li>
</ul>
</div>
<div class="col-xs-4 col-sm-3 col-md-3 col-lg-3">
<div class="footer-title">Links</div>
<ul class="list-unstyled">
<li><a href="http://getpelican.com/" target="_blank">Pelican</a></li>
<li><a href="http://python.org/" target="_blank">Python.org</a></li>
<li><a href="http://jinja.pocoo.org/" target="_blank">Jinja2</a></li>
</ul>
</div>
<div class="col-xs-12 col-sm-3 col-md-3 col-lg-3">
<p class="pull-right text-right">
<small><em>Proudly powered by <a href="http://docs.getpelican.com/" target="_blank">pelican</a></em></small><br/>
<small><em>Theme and code by <a href="https://github.com/molivier" target="_blank">molivier</a></em></small><br/>
<small>© blogname 2015</small>
</p>
</div>
</div>
</div>
</div>
<!-- /Footer -->
<!-- live2d -->
<script src="./js/L2Dwidget.min.js"></script>
<script src="./js/L2Dwidget.0.min.js"></script>
<script>
L2Dwidget.init({
"model":{
"scale":1,"hHeadPos":0.5,"vHeadPos":0.618,
"jsonPath": "./live2d-models/live2d-widget-model-tororo/assets/tororo.model.json"
},
"display":{
"superSample":2,"width":100,"height":220,"position":"right","hOffset":-30,"vOffset":-200
},
"mobile":{
"show":false,"scale":0.5
},
"react":{
"opacityDefault":0.9,"opacityOnHover":0.2
}
});
</script>
<div id="live2d-widget">
<canvas id="live2dcanvas" width="200" height="440"
style="position: fixed; opacity: 1; right: 0px; bottom: 0; z-index: 99999; pointer-events: none;"></canvas>
</div>
</body>
</html>