-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathindex.html
More file actions
196 lines (187 loc) · 9.44 KB
/
index.html
File metadata and controls
196 lines (187 loc) · 9.44 KB
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
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Git brown bag | SimonComputing, Inc.</title>
<meta name="author" content="Raymond Tang">
<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">
<link rel="stylesheet" href="css/reveal.min.css">
<link rel="stylesheet" href="css/theme/default.css" id="theme">
<link rel="stylesheet" href="css/presentation.css">
<!-- For syntax highlighting -->
<link rel="stylesheet" href="lib/css/zenburn.css">
</head>
<body>
<div class="reveal">
<div class="slides">
<section>
<h1>Git Brown Bag</h1>
<h3>A quick primer on some features of git.</h3>
<p>
<small>-<a href="mailto://Raymond.Tang@simoncomputing.com">Raymond Tang</a></small>
</p>
</section>
<section>
<section>
<h2>Quick History</h2>
<ul>
<li>Created by Linus Torvalds in 2005.</li>
<li>Distributed Source Control</li>
<li>Safeguards against corruption, malicious or accidental.</li>
<li>Not be CVS</li>
</ul>
</section>
<section>
<h2>Distributed</h2>
<ul>
<li>Always committing to local.</li>
<li>Git can have any number of remote upstreams.</li>
<li>A branch can be marked as tracking an upstream branch.</li>
</ul>
</section>
<section>
<h2>Branch branch branch</h2>
<ul>
<li>Share as often and without limits.</li>
<li>Isolate your work to stay focused.</li>
<li>Try different approaches without pushing incomplete features.</li>
<li>Inherent code review process.</li>
</ul>
</section>
</section>
<section>
<section>
<h2>git basics</h2>
<ul>
<li>Adding, ignoring, staging and committing.</li>
<li>Branching</li>
<li>Merging</li>
<li>Push and pull</li>
<li>Dealing with Conflicts</li>
</ul>
</section>
<section>
<h2>Features</h2>
<ul>
<li>Partial committing</li>
<li>Local commits</li>
<li>Pull with rebase</li>
<li>Easy branch, tag, checkout, revert, cherry pick...</li>
<li>Diff across branches, commits, etc.</li>
</ul>
</section>
</section>
<section>
<section>
<h2>Workflow Overview</h2>
<ul>
Types of branches
<li>Production</li>
<li>Master</li>
<li>Development</li>
</ul>
</section>
<section>
<img src="img/git-model@2x.png" class="stretch" alt="git branching model"/>
<br />
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">Source</a></small>
</section>
<section>
<h2>Workflow</h2>
<ol>
<li>Get Latest.</li>
<li>Isolate</li>
<li>Work</li>
<li>Test</li>
<li>Share</li>
<li>Repeat</li>
</ol>
</section>
<section>
<h2>Workflow</h2>
<ol>
<li>Get Latest.</li>
<ul><li><pre><code class="bash" data-trim>git pull origin master</code></pre></li></ul>
<li>Isolate</li>
<ul><li><pre><code class="bash" data-trim>git checkout -b feature</code></pre></li></ul>
<li>Work</li>
<li>Test</li>
<ul><li>merge updated master into feature, play</li></ul>
<li>Share</li>
<ul><li>merge feature, push, close issue</li></ul>
<li>Repeat.</li>
</ol>
</section>
</section>
<section>
<section>
<h2>Best Practices</h2>
<ul>
<li>Stick to the feature branches.</li>
<li>Concise commit messages</li>
<li>Pull with Rebase.</li>
<li>Useful commits</li>
</ul>
</section>
<section>
<h2>Useful Commands</h2>
<ul>
<li>Configure your username/email.</li>
<pre><code data-trim class="bash">git config --global user.name "John Doe"</code></pre>
<pre><code data-trim class="bash">git config --global user.email johndoe@example.com</code></pre>
<li>Pull with Rebase always.</li>
<pre><code data-trim class="bash">git config branch.autosetuprebase always</code></pre>
</ul>
</section>
<section>
<h2>Git Tools</h2>
<ul>
<li><a href="https://msysgit.github.io/">git bash</a></li>
<li><a href="http://eclipse.org/egit/">eGit</a></li>
<li><a href="https://www.atlassian.com/software/sourcetree/overview">SourceTree</a></li>
<li><a href="https://github.com/tj/git-extras">git-extras</a></li>
</ul>
</section>
<section>
<h2>Useful References</h2>
<ul>
<li><a href="https://www.youtube.com/watch?v=1ffBJ4sVUb4">Git for Ages 4 and Up Presentation given at Linux Conf Au 2013; [1:39:42]</a></li>
<li><a href="https://try.github.io/levels/1/challenges/1">Brief Interactive git by github.</a></li>
<li><a href="https://pcottle.github.io/learnGitBranching/">Interactive git branching tutorial.</a></li>
<li><a href="http://git.or.cz/course/svn.html">Git - SVN crash course</a></li>
<li><a href="http://learnxinyminutes.com/docs/git/">Learn X in Y.</a></li>
<li><a href="https://github.com/Gazler/githug">Git hug, a level based git knowledge test.</a></li>
<li><a href="nvie.com/posts/a-successful-git-branching-model/">A workflow model</a></li>
<ul>
<li><a href="https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow">Also documented here - Atlassian Tutorial</a></li>
</ul>
</ul>
</section>
</section>
</div>
</div>
<script src="lib/js/head.min.js"></script>
<script src="js/reveal.min.js"></script>
<script>
// Full list of configuration options available here:
// https://github.com/hakimel/reveal.js#configuration
Reveal.initialize({
controls: true,
progress: true,
history: true,
center: true,
slideNumber: true,
keyboard: true,
// Optional libraries used to extend on reveal.js
dependencies: [
{ 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/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
]
});
</script>
</body>
</html>