-
Notifications
You must be signed in to change notification settings - Fork 0
/
git.html
290 lines (161 loc) · 11.2 KB
/
git.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
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
<!DOCTYPE html>
<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
<head>
<meta charset="utf-8">
<meta content="My Online Technical Docs" name="description" />
<meta content="PHP, MySQL, Git, Laravel, Symfony, Composer, HTML5, JavaScript, Phalcon, CakePHP, Java, Unix Shell Scripting, Node Js, CSS, eJabberd XMPP Server, SPHINX - Python Documentation Generator, Docker" name="keywords" />
<meta content="Jasper Carpizo" name="author" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Git Training — Jasper Carpizo documentation</title>
<link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
<link rel="index" title="Index"
href="genindex.html"/>
<link rel="search" title="Search" href="search.html"/>
<link rel="top" title="Jasper Carpizo documentation" href="index.html"/>
<link rel="prev" title="Docker Training" href="docker.html"/>
<script src="_static/js/modernizr.min.js"></script>
</head>
<body class="wy-body-for-nav" role="document">
<div class="wy-grid-for-nav">
<nav data-toggle="wy-nav-shift" class="wy-nav-side">
<div class="wy-side-scroll">
<div class="wy-side-nav-search">
<a href="index.html" class="icon icon-home"> Jasper Carpizo
</a>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
<input type="text" name="q" placeholder="Search docs" />
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
</div>
</div>
<div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
<p class="caption"><span class="caption-text">DevDocs</span></p>
<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="lamp.html">Install LAMP in one command</a></li>
<li class="toctree-l1"><a class="reference internal" href="mac-php.html">Update PHP on Mac OS X</a></li>
<li class="toctree-l1"><a class="reference internal" href="mac-mysql.html">Install MySQL on Mac OS X</a></li>
<li class="toctree-l1"><a class="reference internal" href="doctrine.html">Doctrine Best Practices</a></li>
<li class="toctree-l1"><a class="reference internal" href="sphinx.html">Install Sphinx Documentation</a></li>
<li class="toctree-l1"><a class="reference internal" href="ejabberd.html">Install eJabberd XMPP Server on Ubuntu 14</a></li>
<li class="toctree-l1"><a class="reference internal" href="php-install.html">Install PHP 5.6 or PHP 7.1 on Ubuntu 16.04, 14.04 using PPA</a></li>
<li class="toctree-l1"><a class="reference internal" href="multiple-php.html">Switch between Multiple PHP Version on Ubuntu</a></li>
<li class="toctree-l1"><a class="reference internal" href="solid.html">The First 5 Principles of Object Oriented Design</a></li>
<li class="toctree-l1"><a class="reference internal" href="git-flow.html">Git Flow Integration</a></li>
<li class="toctree-l1"><a class="reference internal" href="virtual-host.html">Set Up Apache Virtual Hosts on Ubuntu 16.04 LTS</a></li>
<li class="toctree-l1"><a class="reference internal" href="install-node.html">Installing Node.js via package manager</a></li>
<li class="toctree-l1"><a class="reference internal" href="file-permission.html">Unix / Linux File permissions</a></li>
<li class="toctree-l1"><a class="reference internal" href="mysql.html">Getting the Best MySQL Performance in Your Products</a></li>
<li class="toctree-l1"><a class="reference internal" href="docker.html">Docker Training</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="#">Git Training</a><ul>
<li class="toctree-l2"><a class="reference internal" href="#command-line-fundamentals">Command-Line Fundamentals</a></li>
<li class="toctree-l2"><a class="reference internal" href="#fixing-common-mistakes-and-undoing-bad-commits">Fixing Common Mistakes and Undoing Bad Commits</a></li>
<li class="toctree-l2"><a class="reference internal" href="#using-the-stash-command">Using the Stash Command</a></li>
<li class="toctree-l2"><a class="reference internal" href="#diff-and-merge-tools">Diff and Merge Tools</a></li>
<li class="toctree-l2"><a class="reference internal" href="#change-diffmerge-font-size-on-mac-osx">Change DiffMerge Font-Size on Mac OSX</a></li>
<li class="toctree-l2"><a class="reference internal" href="#difference-between-add-a-add-u-add-and-add">Difference between “add -A”, “add -u”, “add .”, and “add *”</a></li>
</ul>
</li>
</ul>
</div>
</div>
</nav>
<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
<nav class="wy-nav-top" role="navigation" aria-label="top navigation">
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="index.html">Jasper Carpizo</a>
</nav>
<div class="wy-nav-content">
<div class="rst-content">
<div role="navigation" aria-label="breadcrumbs navigation">
<ul class="wy-breadcrumbs">
<li><a href="index.html">Docs</a> »</li>
<li>Git Training</li>
<li class="wy-breadcrumbs-aside">
<a href="https://github.com/jcarpizo/jcarpizo.github.io/blob/master/source/git.rst" class="fa fa-github"> Edit on GitHub</a>
</li>
</ul>
<hr/>
</div>
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">
<div class="section" id="git-training">
<h1>Git Training<a class="headerlink" href="#git-training" title="Permalink to this headline">¶</a></h1>
<div class="section" id="command-line-fundamentals">
<h2>Command-Line Fundamentals<a class="headerlink" href="#command-line-fundamentals" title="Permalink to this headline">¶</a></h2>
<div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; height: auto;">
<iframe src="https://www.youtube.com/embed/HVsySz-h9r4?list=PL-osiE80TeTuRUfjRe54Eea17-YfnOOAx" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
</div><br/><br/></div>
<div class="section" id="fixing-common-mistakes-and-undoing-bad-commits">
<h2>Fixing Common Mistakes and Undoing Bad Commits<a class="headerlink" href="#fixing-common-mistakes-and-undoing-bad-commits" title="Permalink to this headline">¶</a></h2>
<div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; height: auto;">
<iframe src="https://www.youtube.com/embed/FdZecVxzJbk?list=PL-osiE80TeTuRUfjRe54Eea17-YfnOOAx" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
</div><br/><br/></div>
<div class="section" id="using-the-stash-command">
<h2>Using the Stash Command<a class="headerlink" href="#using-the-stash-command" title="Permalink to this headline">¶</a></h2>
<div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; height: auto;">
<iframe src="https://www.youtube.com/embed/KLEDKgMmbBI?list=PL-osiE80TeTuRUfjRe54Eea17-YfnOOAx" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
</div><br/><br/></div>
<div class="section" id="diff-and-merge-tools">
<h2>Diff and Merge Tools<a class="headerlink" href="#diff-and-merge-tools" title="Permalink to this headline">¶</a></h2>
<div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; height: auto;">
<iframe src="https://www.youtube.com/embed/iCGrKFH2oeo?list=PL-osiE80TeTuRUfjRe54Eea17-YfnOOAx" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
</div><br/><br/></div>
<div class="section" id="change-diffmerge-font-size-on-mac-osx">
<h2>Change DiffMerge Font-Size on Mac OSX<a class="headerlink" href="#change-diffmerge-font-size-on-mac-osx" title="Permalink to this headline">¶</a></h2>
<div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; height: auto;">
<iframe src="https://www.youtube.com/embed/kjBA2WISteM?list=PL-osiE80TeTuRUfjRe54Eea17-YfnOOAx" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
</div><br/><br/></div>
<div class="section" id="difference-between-add-a-add-u-add-and-add">
<h2>Difference between “add -A”, “add -u”, “add .”, and “add <a href="#id1"><span class="problematic" id="id2">*</span></a>”<a class="headerlink" href="#difference-between-add-a-add-u-add-and-add" title="Permalink to this headline">¶</a></h2>
<div style="position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; height: auto;">
<iframe src="https://www.youtube.com/embed/tcd4txbTtAY?list=PL-osiE80TeTuRUfjRe54Eea17-YfnOOAx" frameborder="0" allowfullscreen style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"></iframe>
</div><br/><br/><meta property="og:image" content="jcarpizo.jpg"/>
<meta property="og:title" content="My Online Technical Docs"/>
<meta property="og:site_name" content="Jasper Carpizo"/>
<meta property="og:url" content="https://jcarpizo.github.io"/>
<meta property="og:type" content="blog"/></div>
</div>
</div>
<div class="articleComments">
</div>
</div>
<footer>
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
<a href="docker.html" class="btn btn-neutral" title="Docker Training" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> Previous</a>
</div>
<hr/>
<div role="contentinfo">
<p>
© Copyright 2014, Jasper Carpizo.
</p>
</div>
Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
</footer>
</div>
</div>
</section>
</div>
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true,
SOURCELINK_SUFFIX: '.txt'
};
</script>
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="_static/js/theme.js"></script>
<script type="text/javascript">
jQuery(function () {
SphinxRtdTheme.StickyNav.enable();
});
</script>
</body>
</html>