Skip to content

Commit

Permalink
working on text
Browse files Browse the repository at this point in the history
  • Loading branch information
jlord committed Jan 8, 2014
1 parent 66656d2 commit 449a611
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 36 deletions.
15 changes: 9 additions & 6 deletions problems/commit_to_it/problem.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@
-----------------------------{/cyan}

Next check the {bold}status{/bold} of your repository. Are there changes
listed? View the **diff**erence between the files now and how they were
before you edited. Then {bold}add{/bold} the file you just created to the
files you'd like to {bold}commit{/bold} (aka save) to change. Finally,
commit those changes to the repository's history with a short description
of the updates.See the command hints below!
listed? View the {bold}diff{/bold}erence between the files now and how they
were before you edited.

Then {bold}add{/bold} the file you just created
to the files you'd like to {bold}commit{/bold} (aka save) to change.

Finally, commit those changes to the repository's history with a short
description of the updates.See the command hints below!

{red}- since this is an early challenge, maybe I should be more explicit
about how to type commands?{/red}
Expand All @@ -45,7 +48,7 @@

$ git add <FILENAME>

{bold}To add all files' changes{bold}
{bold}To add all files' changes{/bold}

$ git add .

Expand Down
41 changes: 24 additions & 17 deletions problems/forks_and_clones_oh_my/problem.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
--------------------------------------------------------------------

Now you've made a project locally and pushed it to GitHub, but that's
only half the fun! The other half is working with other projects.
only half the fun! The other half is working with other people and
projects.

When you {bold}fork{/bold} a repository, you're creating a copy of
it on your GitHub.com account. You can then {bold}clone{/bold} it
it on your GitHub.com account. Forks are used for creating your own
version of a project or contributing back fixes or features to the
original project. Once a project is forked, you then {bold}clone{/bold} it
to your computer to work on locally.

{bold}{cyan}
Expand All @@ -16,26 +19,26 @@
The project we'll work with is github.com/jlord/PROJECTREPO. Go
to that site and click the fork button at the top right. Once the
fork is complete, copy your fork's HTTP URL on the right side.

Working with others is one of the best things about GitHub.

{bold}{cyan}
Add Collaborators{/bold}
-----------------{/cyan}

Add collaborators to a project (who will be granted the ability to
edit repository file) by going to your repositories webpage and
clicking the 'Settings' icon on the right side menu. Then select
'Security' tab.


{bold}{cyan}
Hello, Repo Robot!{/bold}
------------------{/cyan}

Working with others is one of the best things about GitHub.

You can add {bold}collaborators{/bold} to a project (who will be granted the
ability to edit repository file) by going to your repositories
webpage and clicking the 'Settings' icon on the right side menu.
Then select'Security' tab. Type in their username to add.

Add 'reporobot' as a collaborator on your fork. RR will join us on
this exercise. YAY!
Add 'reporobot' as a collaborator on your fork. RR will join us for a
few of these exercises. YAY!

{bold}{cyan}
Clone a Repospitory{/bold}
-------------------{/cyan}

Now, in terminal, clone the repo.
Now, in terminal, clone the repository.

$ git clone <URL>

Expand All @@ -45,6 +48,10 @@

Now you've got a copy of the repository on your computer and it is
automatically connected to the remote one on your GitHub account.

{bold}{cyan}
Connect to the Original Repository/bold}
----------------------------------{/cyan}

But what if the original repository you forked changes? You'll want
to be able to {bold}pull{/bold} in those updates too. So let's add a remote
Expand Down
20 changes: 13 additions & 7 deletions problems/get_git/problem.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@
Get Git{/bold}
--------{/cyan}

Git is {bold}open source software{/bold} (free for anyone to use)
written by Linus Torvalds who also wrote the Linux operating system.
Git is {bold}open source software{/bold} (free for anyone to use) written
by Linus Torvalds who also wrote the Linux operating system.

It is a program for keeping track of changes over time, known in
programming as {bold}version control{/bold}.

{cyan}To install Git{/cyan}

- Visit http://git-scm.com/downloads and download the version for
- Visit {bold}http://git-scm.com/downloads{/bold} and download the version for
the operating system that you're using.
- Follow the installation instructions.

Git isn't like other programs on your computer. You'll likely not
see an icon on your desktop, but it will always be there
though and you'll be able to access it at anytime from you're
terminal (which you're in right now!).
see an icon on your desktop, but it will always be available to you
and you'll be able to access it at anytime from you're
terminal (which you're in right now!) or Git desktop applications.

{bold}{cyan}
Configure Git{/bold}
Expand All @@ -31,7 +31,9 @@
want to let Git know who to associate the changes you make to by
telling it your GitHub account name and email address.

Open a new terminal (CMD + N) window and set your username:
Open a new terminal {bold}(CMD + N){/bold} window and set your username:
(You can copy and paste this line or re type it in the new
window you opened.)

$ git config --global user.name "YourGitHubUserName"

Expand All @@ -44,4 +46,8 @@

{appname} verify git-config

PRO TIP: Dollar signs are often used in programming documentation
to signal that the line is command line code. You don't actually
type it in, though!

--------------------------------------------------------------------
6 changes: 3 additions & 3 deletions problems/remote_control/problem.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
--------------------------------------------------------------------

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

{bold}{cyan}
Create a GitHub Account{/bold}
Expand Down Expand Up @@ -62,7 +62,7 @@

{bold}View remote connections{/bold}

$ git remote -v{/yellow}
$ git remote -v

{bold}Push changes{/bold}

Expand Down
7 changes: 4 additions & 3 deletions problems/repository/problem.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
-------------------{/cyan}

You're going to create a new folder and intitalize it as a Git
repository*. You'll need some basic terminal (bash) commands, which
you'll find below.
repository*. You'll need some basic terminal (Bash) commands (below)
for moving around and creating folders (just like you'd do in Finder
or Windows Explorer).

To create a new Git instance for a project, the command is:

Expand All @@ -42,7 +43,7 @@
$ ls {/yellow}

* If you want, you can create a folder that will contain all of your
coding work. You intially start off in your computer's home (root)
coding work. When you open Terminal you start off in your computer's home (root)
directory. From there, create a folder for your code and a folder
for your first repository:

Expand Down

0 comments on commit 449a611

Please sign in to comment.