Skip to content

Commit 479e23b

Browse files
author
Matthew McCullough
committed
Workbook title polish
1 parent 8839e07 commit 479e23b

File tree

4 files changed

+36
-52
lines changed

4 files changed

+36
-52
lines changed

workbooks/github-advanced.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
layout: workbook
3-
title: GitHub Advanced Workbook • Mastering all of Git and GitHub
4-
description: A student and teacher outline to the GitHub Advanced class.
3+
title: GitHub Advanced Workbook
4+
description: This student and teacher workbook will be your companion to the GitHub Advanced class taught by the [GitHub Training Team](http://training.github.com/) and other educational groups. In this course, you'll learn how to leverage all of the shortcuts, commands and advanced workflows of both Git and GitHub.
5+
56
---
67

78

@@ -443,3 +444,10 @@ ssh -T [email protected]
443444
git gui
444445
gitk
445446
```
447+
448+
## Widely used GUIs
449+
450+
### Summary
451+
* <a href="http://git-scm.com/downloads/guis" class="weblink">Listing of GUIs</a>
452+
* <a href="http://eclipse.github.com" class="weblink">eGit for Eclipse</a>
453+
* <a href="http://www.syntevo.com/smartgithg/" class="weblink">SmartGit for Windows, Mac, Linux</a>

workbooks/github-foundations-old.md

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
---
2-
layout: workbook
3-
title: Foundations Workbook
4-
description: This workbook will be your companion for the slides of the GitHub Foundations class taught by the [GitHub Training Team](http://training.github.com/) and other educational groups. In this GitHub Training course, you'll learn all the necessary skills to be productive with GitHub and Git in your open source work or daily job assignments.
5-
---
6-
7-
81
## A Brief Tour of Git <a href="http://git-scm.com/book/en/Getting-Started-Git-Basics" class="booklink">Pro Git Book: Git Basics</a>
92

103
Git has a unique twist on version control in which each _cloned_ copy of the repository contains all branches, tags, and commits ever saved to the project. This provides local-disk speed for almost any operation. Network operations are performed in batch and compressed before sending, thus making over-the-wire operations seem incredibly fast.
@@ -253,20 +246,6 @@ TBD
253246
* Similarity index
254247
* Following history
255248

256-
## Ignore
257-
TBD
258-
259-
* Basic setup
260-
* Standard patterns
261-
* Global configuration
262-
263-
264-
## Checkout
265-
TBD
266-
267-
* Switching branches
268-
* Discarding changes
269-
* Exploring History
270249

271250
## Merge
272251
TBD
@@ -279,19 +258,3 @@ TBD
279258

280259
* Merge preparation
281260
* Interactive
282-
283-
## Reset
284-
TBD
285-
286-
* Hard
287-
* Mixed
288-
* Soft
289-
290-
## Revert
291-
TBD
292-
293-
## GUIs
294-
TBD
295-
296-
## Reflog
297-
TBD

workbooks/github-foundations.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
---
22
layout: workbook
3-
title: GitHub Foundations Workbook • An introduction to the GitHub collaboration platform
4-
description: This workbook will be your companion for the slides of the GitHub Foundations class taught by the [GitHub Training Team](http://training.github.com/) and other educational groups. In this GitHub Training course, you'll learn all the necessary skills to be productive with GitHub and Git in your open source work or daily job assignments.
3+
title: GitHub Foundations Workbook
4+
description: This student and teacher workbook will be your companion to the GitHub Foundations class taught by the [GitHub Training Team](http://training.github.com/) and other educational groups. In this course, you'll learn basic collaboration skills towards a productive use of Git and GitHub in your open source work and daily job assignments.
5+
6+
57
---
68

79
## Version control concepts

workbooks/github-intermediate.md

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: workbook
3-
title: GitHub Intermediate Workbook • Leveraging Git and GitHub from the command line
4-
description: A student and teacher outline to the GitHub Advanced class.
3+
title: GitHub Intermediate Workbook
4+
description: This student and teacher workbook will be your companion to the GitHub Intermediate class taught by the [GitHub Training Team](http://training.github.com/) and other educational groups. In this course, you'll learn how to extensively leverage Git and GitHub from the command line.
55
---
66

77

@@ -132,9 +132,10 @@ git branch --no-merged
132132
### Summary
133133
* `Checkout` as a multi-use command
134134
* Changing branches
135-
* Exploring detached `HEAD`s
135+
* Exploring history (detached`HEAD`)
136136
* Discarding dirty working tree paths
137137

138+
138139
#### Details
139140
```
140141
git checkout [branch]
@@ -240,7 +241,7 @@ git log --stat -M
240241
git log --follow <file>
241242
```
242243

243-
## Undoing commits
244+
## Undoing commits with `revert` and `reset`
244245

245246
### Summary
246247
* Generating commit to restore past patch set
@@ -253,6 +254,7 @@ git log --follow <file>
253254
#### Details
254255
```shell
255256
git revert <REF>
257+
256258
git reset --hard
257259
git reset --mixed
258260
git reset --soft
@@ -261,15 +263,24 @@ git reset --soft
261263
## Ignoring temporary files
262264

263265
### Summary
264-
* Creating a .gitignore
265-
* Adding patterns
266-
* Within _sub directories_
267-
* Negation of ignore pattern
268-
* Global/external ignore
266+
* Create a `.gitignore` file
267+
* Add ignore patterns to the file
268+
* `.gitignore` files can also live in _subdirectories_
269+
* `!` is a negation of ignore pattern
270+
* Global ignore with `core.excludesfile` configuration
269271

270272
#### Details
271273
```
272-
git config --global core.excludesfile
274+
touch .gitignore
275+
echo '*.log' >> .gitignore
276+
git add .gitignore
277+
git commit -m "Ignoring log files"
278+
```
279+
280+
Global ignore file configuration:
281+
282+
```
283+
git config --global core.excludesfile <filepathandname>
273284
```
274285

275286
## Stashing in-progress changes
@@ -286,7 +297,7 @@ git pop
286297
git stash --include-untracked
287298
```
288299

289-
## Recovering almost anything
300+
## Recovering almost anything with the `reflog`
290301

291302
### Summary
292303
* Tracing Git action "history"

0 commit comments

Comments
 (0)