forked from sdelquin/git
-
Notifications
You must be signed in to change notification settings - Fork 0
/
index.html
2271 lines (2129 loc) · 81.2 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
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
/>
<title>Introducción a git</title>
<link rel="stylesheet" href="dist/reset.css" />
<link rel="stylesheet" href="dist/reveal.css" />
<link rel="stylesheet" href="dist/theme/custom.css" />
<!-- Theme used for syntax highlighted code -->
<link rel="stylesheet" href="plugin/highlight/monokai.css" />
</head>
<body>
<div class="reveal">
<div class="slides">
<section>
<h1><code>git</code> ✨</h1>
<p>
<span class="red">
*Lo que nunca te contaron y quizás sería por algo
</span>
</p>
</section>
<section>
<h3>Índice</h3>
<ol>
<li class="fragment">Introducción al control de versiones</li>
<li class="fragment">Preparación del entorno de desarrollo</li>
<li class="fragment">Flujo de trabajo</li>
<li class="fragment">Comandos en detalle</li>
<li class="fragment">Convenciones y buenas prácticas</li>
</ol>
</section>
<section>
<h3>¿Qué es el control de versiones?</h3>
<div class="r-stack">
<div class="blk-full">
<div class="blk-left fragment fade-in-then-semi-out">
<pre>
<code class="console" data-trim data-noescape>
~/work$ ls -l
procesa_datos_00.R
procesa_datos_01.R
procesa_datos_02.R
procesa_datos_03.R
procesa_datos_04.R
procesa_datos_05.R
procesa_datos_06.R
procesa_datos_07.R
procesa_datos_08.R
procesa_datos_09.R
procesa_datos_10.R
procesa_datos_11.R
procesa_datos_12.R
procesa_datos_13.R
procesa_datos_14.R
procesa_datos_15.R
procesa_datos_16.R
procesa_datos_17.R
procesa_datos_18.R
procesa_datos_19.R
procesa_datos_20.R
</code>
</pre>
</div>
<div class="blk-right fragment fade-in-then-semi-out">
<pre>
<code class="console" data-trim data-noescape>
~/work$ tree
.
├── cambios
│ ├── arregla_error1
│ ├── arreglando_procesa
│ ├── mejora_funcionalidad
│ ├── nuevo_problema
│ └── soluciona_bug
├── definitivo
│ ├── lanzamiento
│ ├── version_final
│ └── version_mejorada
└── pruebas
├── pruebas_antes
├── pruebas_despues
└── pruebas_final
14 directories, 0 files
</code>
</pre>
</div>
</div>
<img class="top framed fragment" src="img/nope.gif" />
</div>
</section>
<section>
<blockquote cite="https://es.wikipedia.org/wiki/Control_de_versiones">
“Se llama control de versiones a la gestión de los diversos
<span class="yellow">cambios</span> que se realizan sobre los
elementos de algún producto o una configuración del mismo. Una
versión, revisión o edición de un producto, es el
<span class="red">estado</span> en el que se encuentra el mismo en
un momento dado de su desarrollo o modificación.”
</blockquote>
</section>
<section>
<h3>Aclarando conceptos 1️⃣</h3>
<img src="img/git-layers.jpg" />
</section>
<section data-auto-animate>
<h3>Aclarando conceptos 2️⃣</h3>
<div class="blk-left">
<h4><span class="red">SVN</span></h4>
<div class="r-stack">
<ul class="red-dot">
<li class="fragment" data-fragment-index="0">Centralizado</li>
<li class="fragment" data-fragment-index="1">
Cliente/Servidor
</li>
<li class="fragment" data-fragment-index="2">
Offline limitado
</li>
<li class="fragment" data-fragment-index="3">Más sencillo</li>
<li class="fragment current-visible" data-fragment-index="4">
$\approx 23\%$
</li>
</ul>
</div>
</div>
<div class="blk-right">
<h4><span class="green">GIT</span></h4>
<div class="r-stack">
<ul class="green-dot">
<li class="fragment" data-fragment-index="0">Distribuido</li>
<li class="fragment" data-fragment-index="1">
Cliente+Servidor
</li>
<li class="fragment" data-fragment-index="2">
Offline completo
</li>
<li class="fragment" data-fragment-index="3">Más complejo</li>
<li class="fragment current-visible" data-fragment-index="4">
$\approx 72\%$
</li>
</ul>
</div>
</div>
</section>
<section data-auto-animate>
<h3>Aclarando conceptos 2️⃣</h3>
<div class="blk-left">
<h4><span class="red">SVN</span></h4>
<img class="w25 mar0" src="img/svn-arch.png" />
</div>
<div class="blk-right">
<h4><span class="green">GIT</span></h4>
<img class="w25 mar0" src="img/git-arch.png" />
</div>
</section>
<section>
<h3>Aclarando conceptos 3️⃣</h3>
<!-- prettier-ignore -->
<div class="yellow">
\[ Repositorio \neq Proyecto \]
</div>
<p class="fragment">repo = repositorio</p>
</section>
<section>
<h3>¿Por qué <span class="yellow">Git</span>?</h3>
<ul>
<li>Histórico permanente de cambios.</li>
<li>Copias de seguridad.</li>
<li>Trabajo en equipo.</li>
<li>Crear ramas y/o etiquetas.</li>
<li>Enfoque social.</li>
</ul>
<img class="w40" src="img/git-work.jpg" />
</section>
<section>
<h3>Índice</h3>
<ol>
<li class="strike">Introducción al control de versiones</li>
<li class="yellow">Preparación del entorno de desarrollo</li>
<li>Flujo de trabajo</li>
<li>Comandos en detalle</li>
<li>Convenciones y buenas prácticas</li>
</ol>
</section>
<section>
<h3>¿Tengo <code class="yellow">git</code> instalado?</h3>
<div class="r-stack">
<pre>
<code class="console" data-trim data-noescape>
$ git --version
git version 2.32.0 (Apple Git-132)
</code>
</pre>
<img class="fragment fade-in-then-out" src="img/yeah.gif" />
</div>
<p class="fragment">
☁️
<a href="https://git-scm.com/downloads"
>https://git-scm.com/downloads</a
>
</p>
</section>
<section>
<h3>Establecer credenciales</h3>
<pre>
<code class="console" data-trim data-noescape>
$ git config --global user.name "Sergio Delgado Quintero"
$ git config --global user.email "[email protected]"
</code>
</pre>
<div class="fragment">
<p>
👇🏻 Crea un archivo en <code class="red">$HOME/.gitconfig</code>
</p>
<pre>
<code class="ini" data-trim data-noescape>
[user]
name = Sergio Delgado Quintero
email = [email protected]
</code>
</pre>
</div>
</section>
<section>
<div class="r-fit-text">
<code><span class="yellow">git</span> init</code>
</div>
</section>
<section>
<h3>Inicializar un repositorio</h3>
<div class="r-stack">
<pre class="fragment fade-out" data-fragment-index="0">
<code class="console" data-trim data-noescape>
$ git init
Initialized empty Git repository in /Users/sdelquin/work/.git/
</code>
</pre>
<p class="fragment current-visible" data-fragment-index="0">
¿ <code class="red">.git</code> ?
</p>
<pre class="fragment">
<code class="console" data-trim data-noescape>
$ tree .git
.git
├── HEAD
├── config
├── description
├── hooks
│ ├── applypatch-msg.sample
│ ├── commit-msg.sample
│ ├── fsmonitor-watchman.sample
│ ├── post-update.sample
│ ├── pre-applypatch.sample
│ ├── pre-commit.sample
│ ├── pre-merge-commit.sample
│ ├── pre-push.sample
│ ├── pre-rebase.sample
│ ├── pre-receive.sample
│ ├── prepare-commit-msg.sample
│ ├── push-to-checkout.sample
│ └── update.sample
├── info
│ └── exclude
├── objects
│ ├── info
│ └── pack
└── refs
├── heads
└── tags
</code>
</pre>
</div>
</section>
<section>
<div class="r-fit-text">
<code><span class="yellow">git</span> clone</code>
</div>
</section>
<section>
<h3>Clonar un repositorio</h3>
<div class="blk-left fragment">
<p>Vía <span class="yellow">$ssh$</span></p>
<pre>
<code class="s60 console" data-trim data-noescape>
$ git clone [email protected]:sdelquin/work.git
Cloning into 'work'...
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (4/4), done.
remote: Compressing objects: 100% (3/3), done.
Receiving objects: 100% (4/4), done.
remote: Total 4 (delta 0), reused 0 (delta 0), pack-reused 0
</code>
</pre>
<p class="fragment s70">*Clave pública/privada</p>
</div>
<div class="blk-right fragment">
<p>Vía <span class="red">$https$</span></p>
<pre>
<code class="s60 console" data-trim data-noescape>
$ git clone https://github.com/sdelquin/work.git
Cloning into 'work'...
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (4/4), done.
remote: Compressing objects: 100% (3/3), done.
Receiving objects: 100% (4/4), done.
remote: Total 4 (delta 0), reused 0 (delta 0), pack-reused 0
</code>
</pre>
<p class="fragment s70">*Usuario y password</p>
</div>
</section>
<section>
<h3>Clientes gráficos <span class="yellow">/free/</span></h3>
<table class="s70">
<tr>
<th>Software</th>
<th>OS</th>
<th>Price</th>
</tr>
<tr>
<td><a href="https://desktop.github.com/">GitHub Desktop</a></td>
<td>🍎 🪟 🐧</td>
<td>0</td>
</tr>
<tr>
<td><a href="https://www.sourcetreeapp.com/">SourceTree</a></td>
<td>🍎 🪟</td>
<td>0</td>
</tr>
<tr>
<td><a href="https://tortoisegit.org/">TortoiseGit</a></td>
<td>🪟</td>
<td>0</td>
</tr>
<tr>
<td>
<a href="https://gitextensions.github.io/">Git Extensions</a>
</td>
<td>🍎 🪟 🐧</td>
<td>0</td>
</tr>
<tr>
<td>
<a href="https://www.gitkraken.com/">GitKraken</a>
</td>
<td>🍎 🪟 🐧</td>
<td>0*</td>
</tr>
<tr>
<td>
<a href="https://magit.vc/">Magit</a>
</td>
<td>🍎 🪟 🐧</td>
<td>0</td>
</tr>
<tr>
<td>
<a href="https://github.com/eclipsesource/megit">MeGit</a>
</td>
<td>🍎 🪟 🐧</td>
<td>0</td>
</tr>
<tr>
<td>
<a href="https://www.gitahead.com/">GitAhead</a>
</td>
<td>🍎 🪟 🐧</td>
<td>0</td>
</tr>
<tr>
<td>
<a href="https://github.com/FredrikNoren/ungit">ungit</a>
</td>
<td>🍎 🪟 🐧</td>
<td>0</td>
</tr>
</table>
<p class="fragment s80">
☁️
<a href="️https://git-scm.com/downloads/guis/"
>https://git-scm.com/downloads/guis/</a
>
</p>
</section>
<section>
<h3>Índice</h3>
<ol>
<li class="strike">Introducción al control de versiones</li>
<li class="strike">Preparación del entorno de desarrollo</li>
<li class="yellow">Flujo de trabajo</li>
<li>Comandos en detalle</li>
<li>Convenciones y buenas prácticas</li>
</ol>
</section>
<section>
<h3>Flujo de trabajo 1️⃣</h3>
<p>Crear rama de desarrollo</p>
<pre>
<code class="console" data-trim data-noescape>
$ git switch -c dev
</code>
</pre>
<p class="fragment fade-up">✅</p>
</section>
<section>
<h3>Flujo de trabajo 2️⃣</h3>
<p>Hacer las modificaciones pertinentes</p>
<pre>
<code class="console" data-trim data-noescape>
$ ...
</code>
</pre>
<p class="fragment fade-up">✅</p>
</section>
<section>
<h3>Flujo de trabajo 3️⃣</h3>
<p>Ver el estado del repo</p>
<pre>
<code class="console" data-trim data-noescape>
$ git status
</code>
</pre>
<p class="fragment fade-up">✅</p>
</section>
<section>
<h3>Flujo de trabajo 4️⃣</h3>
<p>Preparar los cambios</p>
<pre>
<code class="console" data-trim data-noescape>
$ git add .
</code>
</pre>
<p class="fragment fade-up">✅</p>
</section>
<section>
<h3>Flujo de trabajo 5️⃣</h3>
<p>Confirmar los cambios</p>
<pre>
<code class="console" data-trim data-noescape>
$ git commit -m "First commit"
</code>
</pre>
<p class="fragment fade-up">✅</p>
</section>
<section>
<h3>Flujo de trabajo 6️⃣</h3>
<p>Subir cambios al servicio web</p>
<pre>
<code class="console" data-trim data-noescape>
$ git push
</code>
</pre>
<p class="fragment fade-up">✅</p>
</section>
<section>
<h3>Índice</h3>
<ol>
<li class="strike">Introducción al control de versiones</li>
<li class="strike">Preparación del entorno de desarrollo</li>
<li class="strike">Flujo de trabajo</li>
<li class="yellow">Comandos en detalle</li>
<li>Convenciones y buenas prácticas</li>
</ol>
</section>
<section>
<h3>Punto de partida</h3>
<p>
☁️
<a href="https://github.com/sdelquin/work.git"
>https://github.com/sdelquin/work.git</a
>
</p>
<pre>
<code class="console nonu" data-trim data-noescape data-line-numbers="1|2|3-4">
$ git clone https://github.com/sdelquin/work.git
$ cd work
$ ls
LICENSE README.md
</code>
</pre>
</section>
<section>
<div class="r-fit-text">
<code><span class="yellow">git</span> status</code>
</div>
<p class="green">Comprobando el estado del repositorio</p>
</section>
<section data-auto-animate>
<h3>
<code>git <span class="red">status</span></code>
</h3>
<pre>
<code class="console nonu" data-trim data-noescape data-line-numbers="1|2|3|5">
$ git status
On branch main
Your branch is up to date with 'origin/main'.
nothing to commit, working tree clean
</code>
</pre>
</section>
<section data-auto-animate>
<h3>
<code>git <span class="red">status</span></code>
</h3>
<p>Modificamos <code>README.md</code> 👷🏻♀️</p>
<pre>
<code class="console nonu" data-trim data-noescape data-line-numbers="1-3|5-8|10">
$ git status
On branch main
Your branch is up to date with 'origin/main'.
Changes not staged for commit:
(use "git add [file]..." to update what will be committed)
(use "git restore [file]..." to discard changes in working directory)
<span class="red">modified: README.md</span>
no changes added to commit (use "git add" and/or "git commit -a")
</code>
</pre>
</section>
<section data-auto-animate>
<h3>Estados de un archivo en <code>git</code></h3>
<img class="w75" src="img/git-states.svg" />
</section>
<section data-auto-animate>
<h3>Estados de un archivo en <code>git</code></h3>
<ul class="animals">
<li class="fragment">
<code>ignored</code>
<span class="green">$\Rightarrow$</span> ignorado
</li>
<li class="fragment">
<code>tracked</code>
<span class="green">$\Rightarrow$</span> con seguimiento
</li>
<li class="fragment">
<code>untracked</code>
<span class="green">$\Rightarrow$</span> sin seguimiento
</li>
<li class="fragment">
<code>modified</code>
<span class="green">$\Rightarrow$</span> modificado
</li>
<li class="fragment">
<code>staged</code>
<span class="green">$\Rightarrow$</span> preparado
<ul class="empty">
<li class="yellow s75">
<code>git add</code> $\rightarrow$ preparar
</li>
</ul>
</li>
<li class="fragment">
<code>committed</code>
<span class="green">$\Rightarrow$</span> confirmado
<ul class="empty">
<li class="yellow s75">
<code>git commit</code> $\rightarrow$ confirmar
</li>
</ul>
</li>
</ul>
</section>
<section>
<div class="r-fit-text">
<code><span class="yellow">git</span> add</code>
</div>
<p class="green">Preparando los cambios</p>
</section>
<section>
<h3>
<code>git <span class="red">add</span></code>
</h3>
<pre>
<code class="console" data-trim data-noescape>
$ git add README.md
</code>
</pre>
<pre class="fragment">
<code class="console nonu" data-trim data-noescape data-line-numbers="1-3|5-7">
$ git status
On branch main
Your branch is up to date with 'origin/main'.
Changes to be committed:
(use "git restore --staged [file]..." to unstage)
<span class="red">modified: README.md</span>
</code>
</pre>
</section>
<section>
<p class="r-fit-text">
⚡ <code>git <span class="red">add</span> .</code>
</p>
</section>
<section>
<div class="r-fit-text">
<code><span class="yellow">git</span> commit</code>
</div>
<p class="green">Confirmando los cambios</p>
</section>
<section>
<h3>
<code>git <span class="red">commit</span></code>
</h3>
<pre>
<code class="console" data-trim data-noescape>
$ git commit -m "Add welcome message"
[main ae0abb3] Add welcome message
1 file changed, 1 insertion(+)
</code>
</pre>
<pre class="fragment">
<code class="console nonu" data-trim data-noescape data-line-numbers="1|2|3-4|6">
$ git status
On branch main
Your branch is ahead of 'origin/main' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
</code>
</pre>
</section>
<section>
<h3>Me olvidé de incluir un cambio en el último commit</h3>
<img src="img/facepalm.gif" />
<p class="fragment yellow">💡 ¡Hay solución!</p>
</section>
<section>
<h3>
<code>git <span class="red">commit</span> --amend</code>
</h3>
<ol>
<li class="fragment">Haz los cambios que necesites 👷🏻♀️</li>
<li class="fragment">
Prepara y confirma los cambios
<pre>
<code class="console" data-trim data-noescape>
$ git add .
$ git commit --amend <span class="red">(-m)</span>
</code>
</pre>
</li>
<li class="fragment">
Opción "desatentida"
<pre>
<code class="console" data-trim data-noescape>
$ git add .
$ git commit --amend --no-edit
</code>
</pre>
</li>
</ol>
</section>
<section>
<div class="r-fit-text">
<code><span class="yellow">git</span> restore</code>
</div>
<p class="green">El <code>CTRL-Z</code> de toda la vida</p>
</section>
<section>
<h3>
<code>git <span class="red">restore</span></code>
</h3>
<p>
<span class="green">Escenario 1:</span> Hemos modificado
<code class="yellow">README.md</code> pero está aún sin preparar
</p>
<div class="r-stack">
<pre class="fragment fade-out" data-fragment-index="0">
<code class="console" data-trim data-noescape>
$ git status
On branch main
Your branch is up to date with 'origin/main'.
Changes not staged for commit:
(use "git add [file]..." to update what will be committed)
(use "git restore [file]..." to discard changes in working directory)
<span class="red">modified: README.md</span>
no changes added to commit (use "git add" and/or "git commit -a")
</code>
</pre>
<div class="fragment" data-fragment-index="0">
<pre>
<code class="console" data-trim data-noescape>
$ git restore README.md
</code>
</pre>
<pre>
<code class="console" data-trim data-noescape>
$ git status
On branch main
Your branch is up to date with 'origin/main'.
nothing to commit, working tree clean
</code>
</pre>
</div>
</div>
</section>
<section>
<h3>
<code>git <span class="red">restore</span></code>
</h3>
<p>
<span class="green">Escenario 2:</span> Hemos modificado
<code class="yellow">README.md</code> y lo hemos preparado
</p>
<div class="r-stack">
<pre class="fragment fade-out" data-fragment-index="0">
<code class="console" data-trim data-noescape>
$ git status
On branch main
Your branch is up to date with 'origin/main'.
Changes to be committed:
(use "git restore --staged [file]..." to unstage)
<span class="red">modified: README.md</span>
</code>
</pre>
<div class="fragment" data-fragment-index="0">
<pre>
<code class="console" data-trim data-noescape>
$ git restore --staged README.md
$ git restore README.md
</code>
</pre>
<pre>
<code class="console" data-trim data-noescape>
$ git status
On branch main
Your branch is up to date with 'origin/main'.
nothing to commit, working tree clean
</code>
</pre>
</div>
</div>
</section>
<section>
<p class="r-fit-text">
⚡ <code>git <span class="red">restore</span> .</code>
</p>
</section>
<section>
<div class="r-fit-text">
<code><span class="yellow">git</span> clean</code>
</div>
<p class="green">Borrando archivos sin seguimiento</p>
</section>
<section>
<h3>
<code>git <span class="red">clean</span></code>
</h3>
<div class="blk-l40">
<pre>
<code class="console s80" data-trim data-noescape>
$ git status
On branch main
Your branch is up to date with 'origin/main'.
Untracked files:
(use "git add [file]..." to include in what will be committed)
<span class="red">process.C</span>
<span class="red">upload.C</span>
nothing added to commit but untracked files present (use "git add" to track)
</code>
</pre>
</div>
<div class="blk-r60">
<pre class="fragment">
<code class="console s80" data-trim data-noescape>
$ <span class="yellow">git clean -i</span>
Would remove the following items:
<span class="red">process.C upload.C</span>
*** Commands ***
1: clean 2: filter by pattern
3: select by numbers 4: ask each
5: quit 6: help
<span class="yellow">What now> 4</span>
Remove process.C [y/N]? y
Remove upload.C [y/N]? y
Removing process.C
Removing upload.C
</code>
</pre>
<p class="fragment s80"><code>⚡ git clean -f</code></p>
</div>
</section>
<section>
<h3>Ramas</h3>
<img src="img/git-branches.svg" />
</section>
<section>
<div class="r-fit-text">
<code><span class="yellow">git</span> branch</code>
</div>
<p class="green">Gestionando las ramas</p>
</section>
<section>
<h3>
<code>git <span class="red">branch</span> 1️⃣</code>
</h3>
<div class="r-stack">
<!-- Fragment -->
<div class="w50 fragment fade-out" data-fragment-index="0">
<p>Ramas locales 🎋</p>
<pre>
<code class="console" data-trim data-noescape>
$ git branch
* main
</code>
</pre>
</div>
<!-- Fragment -->
<div
class="w50 fragment fade-out current-visible"
data-fragment-index="0"
>
<p>Ramas remotas ☁️</p>
<pre>
<code class="console" data-trim data-noescape>
$ git branch -r
origin/HEAD -> origin/main
origin/main
</code>
</pre>
</div>
<!-- Fragment -->
<div class="w60 fragment fade-out current-visible">
<p>Todas las ramas 🌴</p>
<pre>
<code class="console" data-trim data-noescape>
$ git branch -a
* main
remotes/origin/HEAD -> origin/main
remotes/origin/main
</code>
</pre>
</div>
<!-- Fragment -->
<div class="w100 fragment">
<p>Todos los detalles 🔍</p>
<pre>
<code class="console" data-trim data-noescape>
$ git branch -avv
* main 788a2d7 [origin/main] Initial commit
remotes/origin/HEAD -> origin/main
remotes/origin/main 788a2d7 Initial commit
</code>
</pre>
</div>
</div>
</section>
<section>
<h3>
<code>git <span class="red">branch</span> 2️⃣</code>
</h3>
<!-- Fragment -->
<div class="fragment blk-left">
<p>Crear ramas 🚀</p>
<pre>
<code class="console s90" data-trim data-noescape>
$ git branch dev
$ git branch feat
</code>
</pre>
<pre>
<code class="console s90" data-trim data-noescape>
$ git branch
dev
feat
* <span class="green">main</span>
</code>
</pre>
</div>
<!-- Fragment -->
<div class="fragment blk-right">
<p>Borrar ramas 🗑️</p>
<pre>
<code class="console s90" data-trim data-noescape>
$ git branch -d dev
Deleted branch dev (was ae0abb3).
$ git branch -d feat
Deleted branch feat (was ae0abb3).
</code>
</pre>
<pre>
<code class="console s90" data-trim data-noescape>
$ git branch
* <span class="green">main</span>
</code>
</pre>
</div>
</section>
<section>
<div class="r-fit-text">
<code><span class="yellow">git</span> remote</code>
</div>
<p class="green">Gestionando las direcciones remotas</p>
</section>
<section data-auto-animate>
<h3>
<code>git <span class="red">remote</span></code>
</h3>
<pre>
<code class="console" data-trim data-noescape>
$ git remote -v
origin [email protected]:sdelquin/work.git (fetch)
origin [email protected]:sdelquin/work.git (push)
</code>
</pre>
</section>
<section data-auto-animate>
<h3>
<code>git <span class="red">remote</span></code>
</h3>
<h4>Modificando remotos 👷🏻</h4>
<div class="blk-l40 fragment">
<p>
Vía <span class="yellow"><code>git</code></span>
</p>
<ul class="dollar s75">
<li>
<code>git remote <span class="green">add</span></code>
</li>
<li>
<code>git remote <span class="green">remove</span></code>
</li>
</ul>
</div>
<div class="blk-r60 fragment">
<p>
Vía <span class="red"><code>.git/config</code> 🥷🏻</span>
</p>
<pre>
<code class="ini s85 nonu" data-trim data-noescape data-line-numbers="8-9">
[core]
repositoryformatversion = 0