-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathindex.html
113 lines (102 loc) · 3.35 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
<!DOCTYPE html>
<html lang="en">
<head>
<title>Introduction to Git</title>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="node_modules/shower-ribbon/styles/screen-16x10.css">
</head>
<body class="shower list">
<header class="caption">
<h1>Beginning Git</h1>
<p>Marks & Spencer</p>
</header>
<section class="slide">
<h2>Let's learn Git</h2>
<p>Brought to you by <a href="http://www.darrencoxall.com">Darren Coxall</a></p>
</section>
<section class="slide">
<h2>Early notes</h2>
<ul>
<li>Git is a means of tracking changes to your work</li>
<li>GitHub is a place to store those changes away from your machine</li>
<li>
Tracking changes is fantastic to help you...
<ul>
<li>Undo mistakes</li>
<li>Keep multiple versions of your work</li>
<li>Remind you of the things you have done</li>
</ul>
</li>
</ul>
</section>
<section class="slide">
<h2>Git Terminology</h2>
<p>
There are a lot of concepts and taxonomies in git. It helps to get
a basic understanding to better grasp how things fit together.
</p>
</section>
<section class="slide">
<style>
#git-tree {
position: absolute;
bottom: 50px;
right: 30px;
width: 40%;
}
</style>
<h2>Commits, Branches, Master</h2>
<ul>
<li>A commit is a single packaged change</li>
<li>A branch is a collection of changes separated</li>
<li>Master usualy refers to the main branch</li>
</ul>
<img id="git-tree" src="images/git-tree.png" />
</section>
<section class="slide">
<h2>Merging</h2>
<ul>
<li>A merge is when 2 branches are brought together</li>
<li>A merge usually generates a new commit</li>
</ul>
</section>
<section class="slide">
<h2>Remotes</h2>
<ul>
<li>A remote is an external location for git (like GitHub)</li>
</ul>
</section>
<section class="slide">
<h2>Pushing</h2>
<ul>
<li>A push is when you publish your changes to a remote</li>
</ul>
</section>
<section class="slide">
<h2>Pulling</h2>
<ul>
<li>A pull is when you retrieve changes from a remote to your machine</li>
<li>Think of it as checking for updates</li>
</ul>
</section>
<section class="slide">
<h2 class="shout">Time to try it ourselves</h2>
</section>
<section class="slide">
<ul>
<li>https://try.github.io</li>
<li>http://pcottle.github.io/learnGitBranching/</li>
<li>https://www.codecademy.com/en/courses/learn-git/</li>
</ul>
</section>
<!--
To hide progress bar from entire presentation
just remove “progress” element.
-->
<div class="progress"></div>
<script src="node_modules/shower-core/shower.min.js"></script>
<!-- Copyright © 2015 Yours Truly, Famous Inc. -->
</body>
</html>