Skip to content

Commit

Permalink
fix typos in the right folder ✨
Browse files Browse the repository at this point in the history
  • Loading branch information
alicetragedy committed Jul 10, 2014
1 parent d738cb1 commit 53c3ecd
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ $ git-it
#### How it Works

- Use the arrows ↑↓ to select the first challenge and press 'enter'.
- Open the guide with challenge instructions by using the options listed at the bototm of the challenge.
- Open the guide with challenge instructions by using the options listed at the bottom of the challenge.

![img](https://raw.githubusercontent.com/jlord/git-it/master/guide-ss.png)

Expand Down
2 changes: 1 addition & 1 deletion guide/raw-content/11_merge_tada.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h2>Step: Merge Locally</h2>

<p><code>$ git checkout gh-pages</code></p>

<p>Now tell Git what branch you want to merge <em>in</e> — in this case,
<p>Now tell Git what branch you want to merge <em>in</em> — in this case,
your feature branch that begins with "add-".</p>

<p><code>$ git merge &#60;BRANCHNAME&#62;</code></p>
Expand Down
2 changes: 1 addition & 1 deletion guide/raw-content/2_repository.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h2>Repositories</h2>
<h2>Using Terminal</h2>
<p><strong>Terminal</strong> (or Bash) is a way of using your computer by just typing commands. You can rename files, open files, create new folders, and move between directories (folders) all by typing out commands. You can even run a text editor (such as <a href="http://en.wikipedia.org/wiki/Vim_(text_editor)" target="_blank"> Vim</a>) in your terminal and never have to leave!</p>

<p>Besides navigating your computer, you can also use programs in Terminal that have a <strong>command-line interface (CLI)</strong>, meaning they can be run with commands in terminal. Git-it is one, you're using terminal to use it! Git is another. You can access and control Git through commands in terminal, as you'll be doing very soon!.</p>
<p>Besides navigating your computer, you can also use programs in Terminal that have a <strong>command-line interface (CLI)</strong>, meaning they can be run with commands in terminal. Git-it is one, you're using terminal to use it! Git is another. You can access and control Git through commands in terminal, as you'll be doing very soon!</p>

<p>In Git-it you'll learn a few basic command line actions which will be described within the steps.</p>

Expand Down
4 changes: 2 additions & 2 deletions guide/raw-content/4_githubbin.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h2>Better, together</h2>

<p>The repository you've created so far is just on your computer, which
is handy, but makes it pretty hard to share and work with others on.
No worries, that's what GitHubis for!</p>
No worries, that's what GitHub is for!</p>

<h2>Step: Create a GitHub Account</h2>
<p>GitHub is a website that allows people everywhere to upload what
Expand All @@ -18,7 +18,7 @@ <h2>Step: Create a GitHub Account</h2>

<h2>Step: Add username to Git</h2>
<p>Add your GitHub username to your Git configuration,
which will be needed in order to verify the upcoming challenges. Save it exactly as you created it on GitHub — <strong>capitialize where capitalized</strong>.</p>
which will be needed in order to verify the upcoming challenges. Save it exactly as you created it on GitHub — <strong>capitalize where capitalized</strong>.</p>

<p>Add your GitHub username to your configuration:</p>

Expand Down
2 changes: 1 addition & 1 deletion guide/raw-content/5_remote_control.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ <h2>Step: Push Work to your Remote</h2>
a project, you tell Git the <strong>branch name</strong> you want and the
name of the <strong>remote</strong> that it lives on.

<p>In this case, we'll send our branch named, 'master', to our remote on GitHub named 'origin'. </p>
<p>In this case, we'll send our branch named 'master' to our remote on GitHub named 'origin'. </p>

<code>$ git push origin master</code>

Expand Down
4 changes: 2 additions & 2 deletions guide/raw-content/6_forks_and_clones.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h2>Forks</h2>
projects.</p>

<p>When you <strong>fork</strong> a repository, you're creating a copy of it on
your GitHub account. Your fork begins it's life as a <strong>remote</strong> repository. Forks are used for creating your own
your GitHub account. Your fork begins its life as a <strong>remote</strong> repository. Forks are used for creating your own
version of a project or contributing back fixes or features to the
original project. </p>

Expand Down Expand Up @@ -47,7 +47,7 @@ <h2>Step: Clone Fork Locally</h2>
<h2>Step: Connect to the Original Repository</h2>

<p>But what if the original repository you forked from changes? You'll want
to be able to <strong>pull</strong> in those changes too. So lets add another remote
to be able to <strong>pull</strong> in those changes too. So let's add another remote
connection, this time to the original, <a href="http://www.github.com/jlord/patchwork" target="_blank">github.com/jlord/patchwork</a>, repository
with its URL, found on the right hand side of the original on GitHub.</p>

Expand Down

0 comments on commit 53c3ecd

Please sign in to comment.