Skip to content

Commit 51fb347

Browse files
committed
docs: Adds to the basic Git commands
Explains git status, git add, git commit, git branch, git checkout, git merge, merge conflicts, git log, SHA numbers, and git tag. Closes #2
1 parent 7899356 commit 51fb347

7 files changed

Lines changed: 101 additions & 74 deletions

File tree

Git Tutorial.aux

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,17 @@
4545
\@writefile{toc}{\contentsline {section}{\numberline {6}Basic Usage of Git in the Tyler Lab}{12}{section.6}\protected@file@percent }
4646
\@writefile{toc}{\contentsline {subsection}{\numberline {6.1}Local vs Remote Repository}{12}{subsection.6.1}\protected@file@percent }
4747
\@writefile{toc}{\contentsline {subsection}{\numberline {6.2}Access Levels of Git}{12}{subsection.6.2}\protected@file@percent }
48-
\@writefile{toc}{\contentsline {subsection}{\numberline {6.3}General Commit Practices}{13}{subsection.6.3}\protected@file@percent }
49-
\@writefile{toc}{\contentsline {subsubsection}{\numberline {6.3.1}Conventional Commits}{14}{subsubsection.6.3.1}\protected@file@percent }
48+
\@writefile{toc}{\contentsline {subsection}{\numberline {6.3}How to Save Changes to Code (Committing)}{13}{subsection.6.3}\protected@file@percent }
49+
\@writefile{toc}{\contentsline {subsubsection}{\numberline {6.3.1}General Commit Practices}{13}{subsubsection.6.3.1}\protected@file@percent }
50+
\@writefile{toc}{\contentsline {subsubsection}{\numberline {6.3.2}Conventional Commits}{14}{subsubsection.6.3.2}\protected@file@percent }
5051
\@writefile{toc}{\contentsline {subsection}{\numberline {6.4}Branching}{14}{subsection.6.4}\protected@file@percent }
51-
\@writefile{toc}{\contentsline {subsection}{\numberline {6.5}Creating Tags or Releases}{14}{subsection.6.5}\protected@file@percent }
52-
\@writefile{toc}{\contentsline {section}{\numberline {7}Using GitHub}{15}{section.7}\protected@file@percent }
53-
\@writefile{toc}{\contentsline {subsection}{\numberline {7.1}ReadMe}{15}{subsection.7.1}\protected@file@percent }
54-
\@writefile{toc}{\contentsline {subsection}{\numberline {7.2}Creating Releases}{16}{subsection.7.2}\protected@file@percent }
55-
\@writefile{toc}{\contentsline {subsection}{\numberline {7.3}Creating Issues}{16}{subsection.7.3}\protected@file@percent }
56-
\@writefile{toc}{\contentsline {section}{\numberline {8}Conclusion}{16}{section.8}\protected@file@percent }
57-
\gdef \@abspage@last{17}
52+
\@writefile{toc}{\contentsline {subsection}{\numberline {6.5}Merging Changes from a Feature Branch to the Main Branch}{15}{subsection.6.5}\protected@file@percent }
53+
\@writefile{toc}{\contentsline {subsubsection}{\numberline {6.5.1}Merge Conflicts}{15}{subsubsection.6.5.1}\protected@file@percent }
54+
\@writefile{toc}{\contentsline {subsection}{\numberline {6.6}Git Log}{15}{subsection.6.6}\protected@file@percent }
55+
\@writefile{toc}{\contentsline {subsection}{\numberline {6.7}Creating Tags or Releases}{16}{subsection.6.7}\protected@file@percent }
56+
\@writefile{toc}{\contentsline {section}{\numberline {7}Using GitHub}{16}{section.7}\protected@file@percent }
57+
\@writefile{toc}{\contentsline {subsection}{\numberline {7.1}ReadMe}{17}{subsection.7.1}\protected@file@percent }
58+
\@writefile{toc}{\contentsline {subsection}{\numberline {7.2}Creating Releases}{18}{subsection.7.2}\protected@file@percent }
59+
\@writefile{toc}{\contentsline {subsection}{\numberline {7.3}Creating Issues}{18}{subsection.7.3}\protected@file@percent }
60+
\@writefile{toc}{\contentsline {section}{\numberline {8}Conclusion}{18}{section.8}\protected@file@percent }
61+
\gdef \@abspage@last{19}

Git Tutorial.log

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This is pdfTeX, Version 3.14159265-2.6-1.40.21 (MiKTeX 21.1) (preloaded format=pdflatex 2021.2.8) 25 OCT 2021 22:16
1+
This is pdfTeX, Version 3.14159265-2.6-1.40.21 (MiKTeX 21.1) (preloaded format=pdflatex 2021.2.8) 25 OCT 2021 22:54
22
entering extended mode
33
**"./Git Tutorial.tex"
44
("Git Tutorial.tex"
@@ -406,7 +406,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
406406

407407
[2]
408408
(Images/repositories.pdf_tex
409-
<Images//repositories.pdf, id=196, page=1, 673.41853pt x 670.94444pt>
409+
<Images//repositories.pdf, id=221, page=1, 673.41853pt x 670.94444pt>
410410
File: Images//repositories.pdf Graphic file (type pdf)
411411
<use Images//repositories.pdf, page 1>
412412
Package pdftex.def Info: Images//repositories.pdf , page1 used on input line 56
@@ -418,20 +418,20 @@ LaTeX Font Info: External font `cmex10' loaded for size
418418
(Font) <20.74> on input line 57.
419419
LaTeX Font Info: External font `cmex10' loaded for size
420420
(Font) <17.28> on input line 57.
421-
<Images//repositories.pdf, id=197, page=2, 673.41853pt x 670.94444pt>
421+
<Images//repositories.pdf, id=222, page=2, 673.41853pt x 670.94444pt>
422422
File: Images//repositories.pdf Graphic file (type pdf)
423423
<use Images//repositories.pdf, page 2>
424424
Package pdftex.def Info: Images//repositories.pdf , page2 used on input line 59
425425
.
426426
(pdftex.def) Requested size: 469.75499pt x 468.03009pt.
427427
) (Images/commit-history.pdf_tex
428-
<Images//commit-history.pdf, id=198, page=1, 887.13869pt x 304.73422pt>
428+
<Images//commit-history.pdf, id=223, page=1, 887.13869pt x 304.73422pt>
429429
File: Images//commit-history.pdf Graphic file (type pdf)
430430
<use Images//commit-history.pdf, page 1>
431431
Package pdftex.def Info: Images//commit-history.pdf , page1 used on input line
432432
56.
433433
(pdftex.def) Requested size: 469.75499pt x 161.35957pt.
434-
<Images//commit-history.pdf, id=199, page=2, 887.13869pt x 304.73422pt>
434+
<Images//commit-history.pdf, id=224, page=2, 887.13869pt x 304.73422pt>
435435
File: Images//commit-history.pdf Graphic file (type pdf)
436436
<use Images//commit-history.pdf, page 2>
437437
Package pdftex.def Info: Images//commit-history.pdf , page2 used on input line
@@ -442,7 +442,7 @@ Package pdftex.def Info: Images//commit-history.pdf , page2 used on input line
442442
pdfTeX warning: pdflatex (file ./Images//repositories.pdf): PDF inclusion: mult
443443
iple pdfs with page group included in a single page
444444
>] (Images/remote-repos.pdf_tex
445-
<Images//remote-repos.pdf, id=206, page=1, 649.18867pt x 894.94525pt>
445+
<Images//remote-repos.pdf, id=231, page=1, 649.18867pt x 894.94525pt>
446446
File: Images//remote-repos.pdf Graphic file (type pdf)
447447
<use Images//remote-repos.pdf, page 1>
448448
Package pdftex.def Info: Images//remote-repos.pdf , page1 used on input line 56
@@ -457,45 +457,36 @@ ltiple pdfs with page group included in a single page
457457
pdfTeX warning: pdflatex (file ./Images//remote-repos.pdf): PDF inclusion: mult
458458
iple pdfs with page group included in a single page
459459
>] [5] [6] [7] [8]
460-
<Images//GPG Key Listing.png, id=307, 507.0945pt x 151.16475pt>
460+
<Images//GPG Key Listing.png, id=332, 507.0945pt x 151.16475pt>
461461
File: Images//GPG Key Listing.png Graphic file (type png)
462462
<use Images//GPG Key Listing.png>
463463
Package pdftex.def Info: Images//GPG Key Listing.png used on input line 221.
464464
(pdftex.def) Requested size: 253.54662pt x 75.58218pt.
465465
[9] [10 <./Images//GPG Key Listing.png>] [11] [12] [13]
466-
[14] [15] [16] [17] ("Git Tutorial.aux")
467-
468-
Package rerunfilecheck Warning: File `"Git Tutorial".out' has changed.
469-
(rerunfilecheck) Rerun to get outlines right
470-
(rerunfilecheck) or use package `bookmark'.
471-
472-
Package rerunfilecheck Info: Checksums for `"Git Tutorial".out':
473-
(rerunfilecheck) Before: C2D8BD7003D76CC07CA87A92BAC98634;2450
474-
(rerunfilecheck) After: 428D5B97A6C2D328F6F6C5C780C0FD5E;2520.
466+
[14] [15] [16] [17] [18] [19] ("Git Tutorial.aux")
467+
Package rerunfilecheck Info: File `"Git Tutorial".out' has not changed.
468+
(rerunfilecheck) Checksum: F5705C1B6D77716811678129DC60A7C1;2860.
475469
)
476470
Here is how much of TeX's memory you used:
477-
7601 strings out of 479618
478-
118462 string characters out of 2865027
479-
435731 words of memory out of 3000000
480-
24476 multiletter control sequences out of 15000+200000
471+
7611 strings out of 479618
472+
118613 string characters out of 2865027
473+
435734 words of memory out of 3000000
474+
24481 multiletter control sequences out of 15000+200000
481475
411779 words of font info for 54 fonts, out of 3000000 for 9000
482476
1141 hyphenation exceptions out of 8191
483-
71i,15n,75p,1132b,527s stack positions out of 5000i,500n,10000p,200000b,50000s
484-
pdfTeX warning (dest): name{subsubsection.6.2.1} has been referenced but does
485-
not exist, replaced by a fixed one
486-
487-
<C:\Users\nblch\AppData\Local\MiKTeX\fonts/pk/ljfour/jknappen/ec/dpi600\tcrm12
488-
00.pk> <C:\Users\nblch\AppData\Local\MiKTeX\fonts/pk/ljfour/jknappen/ec/dpi600\
489-
tcbx1200.pk><C:/Users/nblch/AppData/Local/Programs/MiKTeX/fonts/type1/public/am
490-
sfonts/cm/cmbx12.pfb><C:/Users/nblch/AppData/Local/Programs/MiKTeX/fonts/type1/
491-
public/amsfonts/cm/cmbxti10.pfb><C:/Users/nblch/AppData/Local/Programs/MiKTeX/f
492-
onts/type1/public/amsfonts/cm/cmmi12.pfb><C:/Users/nblch/AppData/Local/Programs
493-
/MiKTeX/fonts/type1/public/amsfonts/cm/cmr12.pfb><C:/Users/nblch/AppData/Local/
494-
Programs/MiKTeX/fonts/type1/public/amsfonts/cm/cmr17.pfb><C:/Users/nblch/AppDat
495-
a/Local/Programs/MiKTeX/fonts/type1/public/amsfonts/cm/cmsy10.pfb>
496-
Output written on "Git Tutorial.pdf" (17 pages, 246659 bytes).
477+
71i,15n,75p,1304b,527s stack positions out of 5000i,500n,10000p,200000b,50000s
478+
<C:\Users\nblch\AppData\Local\MiKTeX\fonts/pk/ljfour/jknappen/ec/dpi600\tcrm
479+
1200.pk> <C:\Users\nblch\AppData\Local\MiKTeX\fonts/pk/ljfour/jknappen/ec/dpi60
480+
0\tcbx1200.pk><C:/Users/nblch/AppData/Local/Programs/MiKTeX/fonts/type1/public/
481+
amsfonts/cm/cmbx12.pfb><C:/Users/nblch/AppData/Local/Programs/MiKTeX/fonts/type
482+
1/public/amsfonts/cm/cmbxti10.pfb><C:/Users/nblch/AppData/Local/Programs/MiKTeX
483+
/fonts/type1/public/amsfonts/cm/cmmi12.pfb><C:/Users/nblch/AppData/Local/Progra
484+
ms/MiKTeX/fonts/type1/public/amsfonts/cm/cmr12.pfb><C:/Users/nblch/AppData/Loca
485+
l/Programs/MiKTeX/fonts/type1/public/amsfonts/cm/cmr17.pfb><C:/Users/nblch/AppD
486+
ata/Local/Programs/MiKTeX/fonts/type1/public/amsfonts/cm/cmsy10.pfb>
487+
Output written on "Git Tutorial.pdf" (19 pages, 257004 bytes).
497488
PDF statistics:
498-
454 PDF objects out of 1000 (max. 8388607)
499-
143 named destinations out of 1000 (max. 500000)
500-
319 words of extra memory for PDF output out of 10000 (max. 10000000)
489+
489 PDF objects out of 1000 (max. 8388607)
490+
148 named destinations out of 1000 (max. 500000)
491+
359 words of extra memory for PDF output out of 10000 (max. 10000000)
501492

Git Tutorial.out

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,16 @@
2626
\BOOKMARK [1][-]{section.6}{Basic Usage of Git in the Tyler Lab}{}% 26
2727
\BOOKMARK [2][-]{subsection.6.1}{Local vs Remote Repository}{section.6}% 27
2828
\BOOKMARK [2][-]{subsection.6.2}{Access Levels of Git}{section.6}% 28
29-
\BOOKMARK [2][-]{subsection.6.3}{General Commit Practices}{section.6}% 29
30-
\BOOKMARK [3][-]{subsubsection.6.3.1}{Conventional Commits}{subsection.6.3}% 30
31-
\BOOKMARK [2][-]{subsection.6.4}{Branching}{section.6}% 31
32-
\BOOKMARK [2][-]{subsection.6.5}{Creating Tags or Releases}{section.6}% 32
33-
\BOOKMARK [1][-]{section.7}{Using GitHub}{}% 33
34-
\BOOKMARK [2][-]{subsection.7.1}{ReadMe}{section.7}% 34
35-
\BOOKMARK [2][-]{subsection.7.2}{Creating Releases}{section.7}% 35
36-
\BOOKMARK [2][-]{subsection.7.3}{Creating Issues}{section.7}% 36
37-
\BOOKMARK [1][-]{section.8}{Conclusion}{}% 37
29+
\BOOKMARK [2][-]{subsection.6.3}{How to Save Changes to Code \(Committing\)}{section.6}% 29
30+
\BOOKMARK [3][-]{subsubsection.6.3.1}{General Commit Practices}{subsection.6.3}% 30
31+
\BOOKMARK [3][-]{subsubsection.6.3.2}{Conventional Commits}{subsection.6.3}% 31
32+
\BOOKMARK [2][-]{subsection.6.4}{Branching}{section.6}% 32
33+
\BOOKMARK [2][-]{subsection.6.5}{Merging Changes from a Feature Branch to the Main Branch}{section.6}% 33
34+
\BOOKMARK [3][-]{subsubsection.6.5.1}{Merge Conflicts}{subsection.6.5}% 34
35+
\BOOKMARK [2][-]{subsection.6.6}{Git Log}{section.6}% 35
36+
\BOOKMARK [2][-]{subsection.6.7}{Creating Tags or Releases}{section.6}% 36
37+
\BOOKMARK [1][-]{section.7}{Using GitHub}{}% 37
38+
\BOOKMARK [2][-]{subsection.7.1}{ReadMe}{section.7}% 38
39+
\BOOKMARK [2][-]{subsection.7.2}{Creating Releases}{section.7}% 39
40+
\BOOKMARK [2][-]{subsection.7.3}{Creating Issues}{section.7}% 40
41+
\BOOKMARK [1][-]{section.8}{Conclusion}{}% 41

Git Tutorial.pdf

10.1 KB
Binary file not shown.

Git Tutorial.synctex.gz

19.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)