@@ -8,10 +8,11 @@ This curriculum will be your companion to the GitHub Intermediate class taught b
88
99![ Git repository creation at the command line] ( ../assets/screenshots/terminal-repo-creation.jpg )
1010
11- {% capture slide %}
11+ ---
12+
1213### Git Configuration
13- {% endcapture %}
14- {% include slide-section %}
14+
15+ ---
1516
1617![ GitHub for Mac Advanced Preferences] ( ../assets/screenshots/github-for-mac-advanced-preferences.png )
1718
@@ -45,17 +46,19 @@ $ git config --list
4546
4647
4748
48- {% capture slide %}
49+ ---
50+
4951### Start a repository
50- {% endcapture %}
51- {% include slide-section %}
52+
53+ ---
54+
5255
5356
57+ ---
5458
55- {% capture slide %}
5659### Versioning content
57- {% endcapture %}
58- {% include slide-section %}
60+
61+ ---
5962
6063#### Three stage thinking
6164![ diagram] ( ../assets/diagrams/commit-three-stage.svg )
@@ -69,10 +72,11 @@ $ git config --list
6972#### Video
7073<iframe src =" //player.vimeo.com/video/88315552 " width =" 100% " height =" 350 " frameborder =" 0 " webkitallowfullscreen mozallowfullscreen allowfullscreen ></iframe >
7174
72- {% capture slide %}
75+ ---
76+
7377### Review pending modifications
74- {% endcapture %}
75- {% include slide-section %}
78+
79+ ---
7680
7781Git advocates precision in each commit's contents and commit message. This is facilitated by easy reviewing of in-flight changes prior to describing them and making them permanent.
7882
@@ -107,10 +111,11 @@ $ git diff [file-path]
107111#### Video
108112<iframe src =" //player.vimeo.com/video/88315553 " width =" 100% " height =" 350 " frameborder =" 0 " webkitallowfullscreen mozallowfullscreen allowfullscreen ></iframe >
109113
110- {% capture slide %}
114+ ---
115+
111116### Review historical changes
112- {% endcapture %}
113- {% include slide-section %}
117+
118+ ---
114119
115120Git can look back at the history of each commit to see when a change took place, who made the change, or what the change contained.
116121
@@ -135,11 +140,11 @@ $ git log --patch --color-words
135140#### Video
136141<iframe src =" //player.vimeo.com/video/95811891 " width =" 100% " height =" 350 " frameborder =" 0 " webkitallowfullscreen mozallowfullscreen allowfullscreen ></iframe >
137142
138- {% capture slide %}
143+ ---
144+
139145### Local workflows
140- {% endcapture %}
141- {% include slide-section %}
142146
147+ ---
143148
144149Organizing history:
145150
@@ -148,10 +153,11 @@ Organizing history:
148153
149154
150155
151- {% capture slide %}
156+ ---
157+
152158### Distributed repositories
153- {% endcapture %}
154- {% include slide-section %}
159+
160+ ---
155161
156162Acquiring a repo:
157163
@@ -161,44 +167,48 @@ $ git clone [repository-url]
161167
162168
163169
164- {% capture slide %}
170+ ---
171+
165172### Remote workflows
166- {% endcapture %}
167- {% include slide-section %}
173+
174+ ---
168175
169176
170177![ diagram] ( ../assets/diagrams/fork-structure.svg )
171178
172179
173180
174- {% capture slide %}
181+ ---
182+
175183### Shortcuts and custom commands
176- {% endcapture %}
177- {% include slide-section %}
184+
185+ ---
178186
179187
188+ ---
180189
181- {% capture slide %}
182190### File lifecycle
183- {% endcapture %}
184- {% include slide-section %}
191+
192+ ---
193+
185194
186195
187196
188197![ diagram] ( ../assets/diagrams/states-of-tracking.svg )
189198
190199
191- {% capture slide %}
200+ ---
201+
192202### Undoing changes
193- {% endcapture %}
194- {% include slide-section %}
203+
204+ ---
195205
196206
197207
198208
199- {% capture slide %}
200- ### Recovering anything
201- {% endcapture %}
202- {% include slide-section %}
203209
210+ ---
211+
212+ ### Recovering anything
204213
214+ ---
0 commit comments