Skip to content

Commit b31c8c6

Browse files
author
Jordan McCullough
committed
Merge pull request #37 from randomecho/typos-workbook-foundation
Remove dangling SPAN tags from Foundations workbook
2 parents 3632ff4 + 0df9ccc commit b31c8c6

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

workbooks/github-foundations.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: workbook
33
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 Git and GitHub in your open source work or daily job assignments.
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.
55
---
66

77
## Git <a href="http://git-scm.com/book/en/Getting-Started-A-Short-History-of-Git" class="booklink">Pro Git Book: The History of Git</a>
@@ -14,7 +14,7 @@ __Git is an open source distributed__ version control system invented by Linus T
1414
Git is the open source, command line tool that forms a part of the workflows we'll cover in this course. It has been called the successor to CVS and Subversion by many users, and maintains some similarity in behavior to these historical open source version control tools.
1515

1616
### Details
17-
Maintaining a current version of Git is important. While you'll accurately hear that Git is generously backwards-compatible, the latest versions offer error message enhancements, performance tunings, and usability features that make using Git ever more quick and plesant.
17+
Maintaining a current version of Git is important. While you'll accurately hear that Git is generously backwards-compatible, the latest versions offer error message enhancements, performance tunings, and usability features that make using Git ever more quick and pleasant.
1818

1919
Verifying that Git is installed and operational can be done by requesting Git to display its current version using this command:
2020

@@ -26,33 +26,32 @@ $ git --version
2626

2727
GitHub accounts are free. Sign up for one at [github.com/join](https://github.com/join).
2828

29-
GitHub is a Git repository hosting and code collaboration platform for both open source and private projects.</span>
29+
GitHub is a Git repository hosting and code collaboration platform for both open source and private projects.
3030

3131
### Details
3232
GitHub accounts are free for an unlimited quantity of public repositories. Only private repositories cost to host on the service. Private repositories are typically used for closed-source consulting client or corporate products, whereas public repositories are typically used for open source.
3333

3434
Sign up for a free GitHub account at https://github.com/join.
3535

36-
Git can be installed as a unified GitHub GUI and command line or merely via a stand-alone command line.
36+
Git can be installed as a unified GitHub GUI and command line or merely via a stand-alone command line interface.
3737

3838
## GitHub Installers <a href="http://git-scm.com/book/en/Getting-Started-Installing-Git" class="booklink">Pro Git Book: Installing Git</a>
3939

40-
The command line verison of Git has a very light footprint. For most platforms, you can simply copy the binaries to a folder that is on the executable search $PATH. Git is primarily written in C, which means there is a unique installer for each operating system.
40+
The command line version of Git has a very light footprint. For most platforms, you can simply copy the binaries to a folder that is on the executable search $PATH. Git is primarily written in C, which means there is a unique installer for each operating system.
4141

4242
* **Windows**: The GitHub for Windows installer can be found at http://windows.github.com.
4343
* **Mac**: The GitHub for Mac installer can be found at http://mac.github.com.
4444
* **Linux**: Git's source code and a listing of supported package managers can be found at http://git-scm.com/download/linux.
4545

4646
### Details
47-
GitHub is the repository hosting, collaboration, deployment, and distribution platform for your software applications. It facilitates discussing changes-in-progress through the concepts of Issues and Pull Requests and provides a web user interface to much of Git. The web flow made possible by GitHub brings a much wider range of contributors, including documentation specialists, designers, and ops engineers into the flow of contributing to your application's lifecycle.
47+
GitHub is the repository hosting, collaboration, deployment, and distribution platform for your software applications. It facilitates discussing changes-in-progress through the concepts of Issues and Pull Requests and provides a web user interface to much of Git. The web flow made possible by GitHub brings a much wider range of contributors, including documentation specialists, designers, and ops engineers into the flow of contributing to your application's life cycle.
4848

4949
## 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>
5050

5151
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.
5252

5353
### Details
54-
Git is an open source version control system that was built by Linus Torvals and used to version the Linux kernel in 2005. It has gained in popularity ever since and is now the leading version control system for open source projects by some surveys. It shares some behavioral similarities to CVS and Subversion, though departs from their centralized form by its distributed nature.
55-
</span>
54+
Git is an open source version control system that was built by Linus Torvalds and used to version the Linux kernel in 2005. It has gained in popularity ever since and is now the leading version control system for open source projects by some surveys. It shares some behavioral similarities to CVS and Subversion, though departs from their centralized form by its distributed nature.
5655

5756
### Details
5857
<blockquote class="studentquestion">
@@ -146,7 +145,7 @@ cd local-project-name
146145
## Versioning changes
147146
By staging (preparing) paths
148147

149-
Any time a change is to be commited, or preserved in history, it must first be _staged_.
148+
Any time a change is to be committed, or preserved in history, it must first be _staged_.
150149

151150
``` shell
152151
git add path-file
@@ -168,10 +167,10 @@ git commit --amend -m "updated message"
168167
Wrapping commits, or Git version history, within branches is a fast, local, and easy way to focus work and commits within a repository.
169168

170169

171-
### by branching per work endeavor
170+
### By branching per work endeavor
172171
Create a new branch from your current commit
173172

174-
``` shwll
173+
``` shell
175174
git branch your-topic-name
176175
```
177176

@@ -256,7 +255,7 @@ git diff [commit-ref/branch-name]
256255
Inspect the full history of a specific branch, limit the output, or graphically diagram the relationship of commits.
257256

258257

259-
List all commits of current branch in decending order.
258+
List all commits of current branch in descending order.
260259

261260
``` shell
262261
git log

0 commit comments

Comments
 (0)