forked from hakimel/reveal.js
-
Notifications
You must be signed in to change notification settings - Fork 0
/
index.html
274 lines (241 loc) · 7.85 KB
/
index.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
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>reveal.js – The HTML Presentation Framework</title>
<meta name="description" content="A framework for easily creating beautiful presentations using HTML">
<meta name="author" content="Hakim El Hattab">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">
<link rel="stylesheet" href="css/reveal.css">
<link rel="stylesheet" href="css/theme/blood.css" id="theme">
<!-- Code syntax highlighting -->
<link rel="stylesheet" href="lib/css/zenburn.css">
<!-- Printing and PDF exports -->
<script>
var link = document.createElement( 'link' );
link.rel = 'stylesheet';
link.type = 'text/css';
link.href = window.location.search.match( /print-pdf/gi ) ? 'css/print/pdf.css' : 'css/print/paper.css';
document.getElementsByTagName( 'head' )[0].appendChild( link );
</script>
<!--[if lt IE 9]>
<script src="lib/js/html5shiv.js"></script>
<![endif]-->
</head>
<body>
<div class="reveal">
<!-- Any section element inside of this container is displayed as a slide -->
<div class="slides">
<section>
<h1>GIT 4 newbies</h1>
<h3>Como empezar a usar GIT sin miedo</h3>
<p>
<small>Created by Jon E./ <a href="http://twitter.com/viroide">@Viroide</a></small>
</p>
</section>
<section>
<h2>Indice</h2>
<ul>
<li>Git config (pon tu nombre a tus commits)</li>
<li>Primeros commits</li>
<li>Como moverse por la historia de Git. Nada se pierde con git, trabaja con tranquilidad.</li>
<li>Branches, haz tus propias ramas.</li>
<li>Git flow (features, fixes & releases)</li>
<li>SmartGit || sourceTree </li>
<li>Dudas y ruegos.</li>
</ul>
</section>
<section data-background="http://i.giphy.com/90F8aUepslB84.gif">
<h2>Nada se pierde!</h2>
</section>
<section>
<h2>Git config</h2>
<pre><code class="hljs" data-trim contenteditable>
$ git config --global user.name "John Doe"
$ git config --global user.email [email protected]
$ git config --list
</code></pre>
<p>Bien! Ya no serás anonimous ;-)</p>
</section>
<section>
<section>
<h2>Primeros commits</h2>
</section>
<section>
<h3>Iniciar un repo</h3>
<pre><code class="hljs" data-trim contenteditable>
$ git init
</code></pre>
<p>Solo hace falta para iniciar un <strong class="resaltar">repo</strong></p>
</section>
<section>
<h3>Clonar un repo</h3>
<pre><code class="hljs" data-trim contenteditable>
$ git clone [email protected]:repositorio.git
</code></pre>
</section>
<section>
<h2>Un poco de teoría</h2>
<img src="./img/live_cicle.png" alt="">
</section>
<section>
<img src="./img/remotes.png" alt="">
</section>
<section>
<h3>Mi primer commit</h3>
<pre><code class="hljs" data-trim contenteditable>
$ touch README.md
$ git add README.md
$ git commit -m "Hola mundo este es mi primer commit!"
</code></pre>
</section>
<section>
<h3>Segundo commit</h3>
<p>Hacemos cambios en el README.md</p>
<pre><code class="hljs" data-trim contenteditable>
$ git status
$ git commit -a
</code></pre>
<p>Ya tenemos 2 commits</p>
</section>
<section>
<h3>Enviar al <span class="resaltar">remote:origin</span></h3>
<pre><code class="hljs" data-trim contenteditable>
$ git pull origin/master
$ git push origin/master
</code></pre>
</section>
<section>
<h3>Merge hell</h3>
<pre><code class="hljs" data-trim contenteditable>
Lineas comunes entre tu repo y el remoto
<<<<<<< yours:README.md
Tu código
=======
Su código
>>>>>>> theirs:README.md
Lineas comunes entre tu repo y el remoto
</code></pre>
</section>
</section>
<section>
<section>
<h2>Moverse entre commits</h2>
</section>
<section>
<h3>Git log es nuestro indice</h3>
<pre><code class="hljs" data-trim contenteditable>
$ git log
commit 15844935057dcf8cfba38726b1433e6a24c7fe43
Author: Jon E. Eguiluz <[email protected]>
Date: Mon Mar 7 19:37:47 2016 +0100
tercer commit
commit 148a72216884cd1ea541d53f56847ac23f702522
Author: Jon E. Eguiluz <[email protected]>
Date: Mon Mar 7 19:17:01 2016 +0100
segundo commit
commit 2ed6dd132718a42b524f14ae216df0d78d2a1144
Author: Jon E. Eguiluz <[email protected]>
Date: Mon Mar 7 19:09:09 2016 +0100
Hola mundo! este es mi primer commit
</code></pre>
</section>
<section>
<h3>Retrocedamos en el tiempo</h3>
<pre><code class="hljs" data-trim contenteditable>
$ git checkout 2ed6dd132718a42b524f14ae216df0d78d2a1144
$ git checkout 2ed6dd13
</code></pre>
</section>
<section>
<h3>Back to the future</h3>
<pre><code class="hljs" data-trim contenteditable>
$ git checkout master
</code></pre>
</section>
</section>
<section>
<section>
<h2>Branches, haz tus propias ramas.</h2>
</section>
<section>
<h3>Creamos nuestra rama</h3>
<pre><code class="hljs" data-trim contenteditable>
$ git checkout -b rama_nueva
</code></pre>
</section>
<section>
<h3>Igual que "master, pero menos peligrosa</h3>
<pre><code class="hljs" data-trim contenteditable>
$ git commit -am "primer commit de esta rama"...
</code></pre>
</section>
<section>
<h3>La mandamos a origin</h3>
<pre><code class="hljs" data-trim contenteditable>
$ git push -u origin rama_nueva
</code></pre>
</section>
<section>
<h3>Lléveme a master, por favor</h3>
<pre><code class="hljs" data-trim contenteditable>
$ git checkout master
</code></pre>
</section>
<section>
<h3>Merge = juntar ramas</h3>
<pre><code class="hljs" data-trim contenteditable>
$ git merge "rama_solo_para_nosotros"
</code></pre>
</section>
</section>
<section>
<h3>GIT stash</h3>
<p>Estos cambios no los quiero commitear, pero...</p>
<pre><code class="hljs" data-trim contenteditable>
$ git stash
$ git stash save "blah blah blah"
$ git stash list
$ git stash pop stash@{1}
</code></pre>
</section>
<section>
<h2>Git flow </h2>
<h3>features, fixes & releases</h3>
<a href="http://danielkummer.github.io/git-flow-cheatsheet/" target="_blank">git-flow cheatsheet</a>
</section>
<section>
<h2>SmartGit || sourceTree</h2>
<p>Nos dejamos de comandos y vamos a lo pr0</p>
</section>
<section data-background="http://i.giphy.com/2iPW4tKgVmjII.gif">
<h2>Dudas y preguntas</h2>
</section>
</div>
</div>
<script src="lib/js/head.min.js"></script>
<script src="js/reveal.js"></script>
<script>
// Full list of configuration options available at:
// https://github.com/hakimel/reveal.js#configuration
Reveal.initialize({
controls: true,
progress: true,
history: true,
center: true,
transition: 'slide', // none/fade/slide/convex/concave/zoom
// Optional reveal.js plugins
dependencies: [
{ src: 'lib/js/classList.js', condition: function() { return !document.body.classList; } },
{ src: 'plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
{ src: 'plugin/zoom-js/zoom.js', async: true },
{ src: 'plugin/notes/notes.js', async: true }
]
});
</script>
</body>
</html>