Skip to content

Commit 22e13ac

Browse files
author
Matthew McCullough
committed
Styling workbooks
1 parent cff829d commit 22e13ac

File tree

2 files changed

+36
-18
lines changed

2 files changed

+36
-18
lines changed

workbooks/github-foundations.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@ description: This workbook will be your companion for the slides of the GitHub F
66

77
## Version control concepts
88

9-
### DETAILS
9+
### Summary
1010
* Git, the information tracker
1111
* GitHub, the collaboration platform
1212
* Distributed version control
1313

1414
## Ways of interacting with repositories
1515

16-
### DETAILS
16+
### Summary
1717
* GitHub web flow
1818
* GitHub GUIs for Mac, Windows
1919
* Command line
2020

2121
## Getting to know GitHub
2222

23-
### DETAILS
23+
### Summary
2424
* Repository initialization
2525
* Actionable steps (Create, Edit, Remove, Move)
2626
* Commits (page)
2727

2828
## Version control basics
2929

30-
### DETAILS
30+
### Summary
3131
* Commits
3232
* Line-level tracking
3333
* Commit messages
@@ -39,14 +39,14 @@ description: This workbook will be your companion for the slides of the GitHub F
3939

4040
## Acquiring repos
4141

42-
### DETAILS
42+
### Summary
4343
* Clone from web (Clone in Desktop button)
4444
* Clone via personal repo list in GitHub Desktop
4545
* Complete "copy" explanation
4646

4747
## Local repository interaction
4848

49-
### DETAILS
49+
### Summary
5050
* Changes (with text editor)
5151
* Comparison (diff via GHfD)
5252
* Commits
@@ -56,7 +56,7 @@ description: This workbook will be your companion for the slides of the GitHub F
5656

5757
## GitHub Workflows
5858

59-
### DETAILS
59+
### Summary
6060
* Forking
6161
* Reason for forks
6262
* What it encourages
@@ -75,7 +75,7 @@ description: This workbook will be your companion for the slides of the GitHub F
7575

7676
## GitHub Visualizations
7777

78-
### DETAILS
78+
### Summary
7979
* Comparing/Diff-ing
8080
* Code
8181
* Prose
@@ -91,7 +91,7 @@ description: This workbook will be your companion for the slides of the GitHub F
9191

9292
## Project Management
9393

94-
### DETAILS
94+
### Summary
9595
* GitHub Issues
9696
* Milestones
9797
* Pulse

workbooks/github-intermediate.md

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ description: A student and teacher outline to the GitHub Advanced class.
1111
* Scopes
1212
* Excludesfile
1313

14+
#### Details
1415
```
1516
git config --list
1617
git config user.name
@@ -26,6 +27,7 @@ git config --global color.ui auto
2627
* Existing project
2728
* Cloning
2829

30+
#### Details
2931
```
3032
git init [project-name]
3133
@@ -38,22 +40,24 @@ git clone [url] [optional-name]
3840
## Repository internals
3941

4042
### Summary
41-
* Exploring fundamentals
42-
* `.git`
43-
* All history stored locally
44-
* Distributed nature, simultaneous changes
45-
* No locking
46-
* Optimized for text, small files
47-
* HEAD
48-
* Index/Staging
43+
* Exploring the fundamentals
44+
* `.git` folder
45+
* All history stored locally
46+
* Distributed nature, simultaneous changes
47+
* No locking
48+
* Optimized for text, small files
49+
* `HEAD` symbol
50+
* Staging area (index file)
4951
* `refs/heads/`
5052
* Efficiency of storage (zlib)
5153

5254
## Commits at the command line
5355

5456
### Summary
5557
* Three stage thinking
58+
* edit, select, save
5659

60+
#### Details
5761
```
5862
git status
5963
git add <filename>
@@ -70,6 +74,7 @@ git commit -m"<message>"
7074
* Dependent upon file state
7175
* Useful option switches
7276

77+
#### Details
7378
```
7479
git diff
7580
git diff --staged
@@ -86,6 +91,7 @@ git diff --stat -w --color-words
8691
* Filtering by message
8792
* Filtering by patch
8893

94+
#### Details
8995
```
9096
git log
9197
git log -<n>`
@@ -111,6 +117,7 @@ git log --decorate
111117
* Deleting
112118
* Renaming
113119

120+
#### Details
114121
```
115122
git branch
116123
git branch <name> <ref>
@@ -128,6 +135,7 @@ git branch --no-merged
128135
* Exploring detached `HEAD`s
129136
* Discarding dirty working tree paths
130137

138+
#### Details
131139
```
132140
git checkout [branch]
133141
git checkout -- [file]
@@ -142,6 +150,7 @@ git checkout [ref]
142150
* Aliasing, bookmark to server URL
143151
* Removing connections
144152

153+
#### Details
145154
```
146155
git clone -o github <URL>
147156
git remote add <name> <path>
@@ -156,6 +165,7 @@ git remote rm <name>
156165
* Showing remote branches
157166
* Showing all branches
158167

168+
#### Details
159169
```
160170
git push -u origin master
161171
git config --global push.default matching
@@ -171,6 +181,7 @@ git branch -a`
171181
* Resolving conflicting merges (manually edit)
172182
* Resolving file with shortcuts
173183

184+
#### Details
174185
```
175186
git pull origin
176187
git pull
@@ -193,6 +204,7 @@ git commit
193204
* Comparing without merge
194205
* Merging selectively
195206

207+
#### Details
196208
```
197209
git fetch [remote]
198210
git branch -a
@@ -205,6 +217,7 @@ git branch -a
205217
* Removing files
206218
* Un-tracking files
207219

220+
#### Details
208221
```shell
209222
git add -u .
210223
git rm <file>
@@ -217,6 +230,7 @@ git rm --cached -- <filename>
217230
* Moving generates new tree, not a new blob
218231
* Similarity Index engaged when committing
219232

233+
#### Details
220234
```shell
221235
mv <file> <newfilename>
222236
git add -A .
@@ -236,12 +250,12 @@ git log --follow <file>
236250
* By commit ref, branch name, remote
237251
* Why the different flavors (deep dive)
238252

253+
#### Details
239254
```shell
240255
git revert <REF>
241256
git reset --hard
242257
git reset --mixed
243258
git reset --soft
244-
245259
```
246260

247261
## Ignoring temporary files
@@ -253,6 +267,7 @@ git reset --soft
253267
* Negation of ignore pattern
254268
* Global/external ignore
255269

270+
#### Details
256271
```
257272
git config --global core.excludesfile
258273
```
@@ -264,6 +279,7 @@ git config --global core.excludesfile
264279
* Restoring by popping
265280
* Move aside untracked files
266281

282+
#### Details
267283
```
268284
git stash
269285
git pop
@@ -276,6 +292,7 @@ git stash --include-untracked
276292
* Tracing Git action "history"
277293
* Explore last actions
278294

295+
#### Details
279296
```
280297
git reflog
281298
git reflog --all
@@ -302,6 +319,7 @@ git checkout HEAD@{1}
302319
* Quicker access to complex commands
303320
* Compatible with zsh completions
304321

322+
#### Details
305323
```
306324
git config --global alias.l "log --oneline --stat"
307325
git config alias.s "status -s"

0 commit comments

Comments
 (0)