From c9055e51fe06c70dd6376a960f18bbf5babb4a1b Mon Sep 17 00:00:00 2001 From: Cameron McEfee Date: Fri, 25 Feb 2011 16:17:08 -0800 Subject: Updated content and added a new 'more info' tool --- _posts/2011-02-15-linux-set-up-git.markdown | 81 +++++++++++++------------ _posts/2011-02-15-mac-set-up-git.markdown | 27 +++++---- _posts/2011-02-15-win-set-up-git.markdown | 79 ++++++++++++------------- _posts/2011-02-16-create-a-repo.markdown | 10 ++-- _posts/2011-02-17-fork-a-repo.markdown | 25 ++++++-- _posts/2011-02-18-be-social.markdown | 12 ++++ css/style.css | 92 ++--------------------------- 7 files changed, 135 insertions(+), 191 deletions(-) diff --git a/_posts/2011-02-15-linux-set-up-git.markdown b/_posts/2011-02-15-linux-set-up-git.markdown index 8b58ae6..0450529 100644 --- a/_posts/2011-02-15-linux-set-up-git.markdown +++ b/_posts/2011-02-15-linux-set-up-git.markdown @@ -34,46 +34,44 @@ To make sure you generate a brand new key, you need to check if one already exis Open the terminal -Need a quick lesson about Terminal? - -   - -

Code blocks like those on this page are part of a scripting language called Bash. To use Bash scripts, we need to use an application that comes with Linux called Terminal.

- -

Input

- 
-				$ echo 'This is input text'This tooltip tells you what's going on.
-
- -

A line that begins with the dollar sign ($) indicates a line of Bash script you need to type. To enter it, type the text that follows the $, hitting the return key at the end of each line. You can hover your mouse over each line to see what the script is doing

- -

Output

- 
-				$ This is output text.
-
- -

A line that does not begin with a $ is output text that is intended to give you information or tell you what to do next. We've colored output text green in these bootcamp tutorials.

- -

User Specific Input

- 
-				$ echo 'username'Outputs the text in the quote marks.
-
- -

Areas of yellow text represent your own personal info. If it is part of an input ($) line, you should replace your it with your own info when you type it. If it is part of output text, it is just for your reference. It will automatically show your own info in Terminal

- -

Good to know: There will be times when you type code, hit return, and all you are given is another prompt. Some actions that you execute in the Terminal don’t have any output. Don’t worry, if there is ever a problem with your code, Terminal will let you know.

+
+

Need a quick lesson about Terminal?

+
+

Code blocks like those on this page are part of a scripting language called Bash. To use Bash scripts, we need to use an application that comes with your Mac called Terminal.

-

Good to know: For security reasons, Terminal will not display what you type when entering passwords. Just type your password and hit the return key.

- - - +

Input

+ 
+			$ echo 'This is input text'This tooltip tells you what's going on.
+
+ +

A line that begins with the dollar sign ($) indicates a line of Bash script you need to type. To enter it, type the text that follows the $, hitting the return key at the end of each line. You can hover your mouse over each line for an explanation of what the script is doing

+ +

Output

+ 
+			$ This is output text.
+
+ +

A line that does not begin with a $ is output text that is intended to give you information or tell you what to do next. We’ve colored output text green in these bootcamp tutorials.

+ +

User Specific Input

+ 
+			$ echo 'username'Outputs the text in the quote marks.
+
+ +

Areas of yellow text represent your own personal info, repos, etc. If it is part of an input ($) line, you should replace your it with your own info when you type it. If it is part of output text, it is just for your reference. It will automatically show your own info in Terminal

+ +

Good to know: There will be times when you type code, hit return, and all you are given is another prompt. Some actions that you execute in Terminal don’t have any output. Don’t worry, if there is ever a problem with your code, Terminal will let you know.

+ +

Good to know: For security reasons, Terminal will not display what you type when entering passwords. Just type your password and hit the return key.

+
+
1. Check for SSH keys. Have an existing kepair? You can skip to Step 4. First, we need to check for existing ssh keys on your computer: 
-	$ cd ~/.sshChecks to see if there is a folder named ".ssh" in you user directory
+	$ cd ~/.sshChecks to see if there is a directory named ".ssh" in your user directory
If it says “No such file or directory“ skip to __step 3__. Otherwise continue to __step 2__. @@ -85,9 +83,9 @@ To make sure you generate a brand new key, you need to check if one already exis 
 	$ lsLists all the subdirectories in the current directory
 	config  id_rsa  id_rsa.pub  known_hosts
-	$ mkdir key_backupMakes a folder called "key_backup" in the current directory
-	$ cp id_rsa* key_backupCopies the contents of the id_rsa folder into key_backup folder
-	$ rm id_rsa*Deletes the contents of the id_rsa folder
+	$ mkdir key_backupMakes a directory called "key_backup" in the current directory
+	$ cp id_rsa* key_backupCopies the contents of the id_rsa directory into key_backup directory
+	$ rm id_rsa*Deletes the contents of the id_rsa directory
3. Generate a new SSH key. @@ -136,7 +134,7 @@ To make sure you generate a brand new key, you need to check if one already exis 
 	$ sudo apt-get install xclipDownloads and installs xclip
-	$ cat ~/.ssh/id_rsa.pub | xclip -sel clipCopies the contents of the id_rsa.pub file to your clipboard
+	$ xclip -sel clip < ~/.ssh/id_rsa.pubCopies the contents of the id_rsa.pub file to your clipboard
Now paste it into the “Key” field. @@ -164,12 +162,13 @@ To make sure you generate a brand new key, you need to check if one already exis Don’t worry, this is supposed to happen. Type “yes”. 
-	Warning: Permanently added 'github.com,207.97.227.239' (RSA) to the list of known hosts.
-	ERROR: Hi username! You've successfully authenticated, but GitHub does not provide 
shell access
+	PTY allocation request failed on channel 0
+	Hi username! You've successfully authenticated, but GitHub does not provide shell access.
 	Connection to github.com closed.
+
- - You don’t worry, about the “ERROR”. You actually want to see that. + + Don’t worry, about the “failed” part. All you should about is that you see “You’ve successfully authenticated” ##Then: Set Up Your Info diff --git a/_posts/2011-02-15-mac-set-up-git.markdown b/_posts/2011-02-15-mac-set-up-git.markdown index a35e587..5cad08f 100644 --- a/_posts/2011-02-15-mac-set-up-git.markdown +++ b/_posts/2011-02-15-mac-set-up-git.markdown @@ -27,30 +27,30 @@ To make sure you generate a brand new key, you need to check if one already exis

Need a quick lesson about Terminal?

-

Code blocks like those on this page are part of a scripting language called Bash. To use Bash scripts, we need to use an application that comes with Linux called Terminal.

+

Code blocks like those on this page are part of a scripting language called Bash. To use Bash scripts, we need to use an application that comes with your Mac called Terminal.

Input

 			$ echo 'This is input text'This tooltip tells you what's going on.
-

A line that begins with the dollar sign ($) indicates a line of Bash script you need to type. To enter it, type the text that follows the $, hitting the return key at the end of each line. You can hover your mouse over each line to see what the script is doing

+

A line that begins with the dollar sign ($) indicates a line of Bash script you need to type. To enter it, type the text that follows the $, hitting the return key at the end of each line. You can hover your mouse over each line for an explanation of what the script is doing

Output

 			$ This is output text.
-

A line that does not begin with a $ is output text that is intended to give you information or tell you what to do next. We've colored output text green in these bootcamp tutorials.

+

A line that does not begin with a $ is output text that is intended to give you information or tell you what to do next. We’ve colored output text green in these bootcamp tutorials.

User Specific Input

 			$ echo 'username'Outputs the text in the quote marks.
-

Areas of yellow text represent your own personal info. If it is part of an input ($) line, you should replace your it with your own info when you type it. If it is part of output text, it is just for your reference. It will automatically show your own info in Terminal

+

Areas of yellow text represent your own personal info, repos, etc. If it is part of an input ($) line, you should replace your it with your own info when you type it. If it is part of output text, it is just for your reference. It will automatically show your own info in Terminal

-

Good to know: There will be times when you type code, hit return, and all you are given is another prompt. Some actions that you execute in the Terminal don’t have any output. Don’t worry, if there is ever a problem with your code, Terminal will let you know.

+

Good to know: There will be times when you type code, hit return, and all you are given is another prompt. Some actions that you execute in Terminal don’t have any output. Don’t worry, if there is ever a problem with your code, Terminal will let you know.

Good to know: For security reasons, Terminal will not display what you type when entering passwords. Just type your password and hit the return key.

@@ -61,7 +61,7 @@ To make sure you generate a brand new key, you need to check if one already exis First, we need to check for existing ssh keys on your computer: 
-	$ cd ~/.sshChecks to see if there is a folder named ".ssh" in you user directory
+	$ cd ~/.sshChecks to see if there is a directory named ".ssh" in your user directory
If it says “No such file or directory“ skip to __step 3__. Otherwise continue to __step 2__. @@ -73,9 +73,9 @@ To make sure you generate a brand new key, you need to check if one already exis 
 	$ lsLists all the subdirectories in the current directory
 	config  id_rsa  id_rsa.pub  known_hosts
-	$ mkdir key_backupMakes a folder called "key_backup" in the current directory
-	$ cp id_rsa* key_backupCopies the contents of the id_rsa folder into key_backup folder
-	$ rm id_rsa*Deletes the contents of the id_rsa folder
+	$ mkdir key_backupMakes a directory called "key_backup" in the current directory
+	$ cp id_rsa* key_backupCopies the contents of the id_rsa directory into key_backup  
+	$ rm id_rsa*Deletes the contents of the id_rsa directory
3. Generate a new SSH key. @@ -123,7 +123,7 @@ To make sure you generate a brand new key, you need to check if one already exis __It’s important you copy your SSH key exactly as it is written without adding any newlines or whitespace.__ To ensure this, run the following code to copy the key to your clipboard. 
-	$ cat ~/.ssh/id_rsa.pub | pbcopyCopies the contents of the id_rsa.pub file to your clipboard
+	$ pbcopy < ~/.ssh/id_rsa.pubCopies the contents of the id_rsa.pub file to your clipboard
Now paste it into the “Key” field. @@ -151,12 +151,13 @@ To make sure you generate a brand new key, you need to check if one already exis Don’t worry, this is supposed to happen. Type “yes”. 
-	Warning: Permanently added 'github.com,207.97.227.239' (RSA) to the list of known hosts.
-	ERROR: Hi username! You've successfully authenticated, but GitHub does not provide 
shell access
+	PTY allocation request failed on channel 0
+	Hi username! You've successfully authenticated, but GitHub does not provide shell access.
 	Connection to github.com closed.
+
- You don’t worry, about the “ERROR”. You actually want to see that. + Don’t worry, about the “failed” part. All you should about is that you see “You’ve successfully authenticated” ##Then: Set Up Your Info diff --git a/_posts/2011-02-15-win-set-up-git.markdown b/_posts/2011-02-15-win-set-up-git.markdown index e1a8878..6d7db1a 100644 --- a/_posts/2011-02-15-win-set-up-git.markdown +++ b/_posts/2011-02-15-win-set-up-git.markdown @@ -37,46 +37,44 @@ To make sure you generate a brand new key, you need to check if one already exis Open the terminal -Need a quick lesson about Terminal? - -   - -

Code blocks like those on this page are part of a scripting language called Bash. To use Bash scripts, we need to use an application that comes with Linux called Terminal.

- -

Input

- 
-				$ echo 'This is input text'This tooltip tells you what's going on.
-
- -

A line that begins with the dollar sign ($) indicates a line of Bash script you need to type. To enter it, type the text that follows the $, hitting the return key at the end of each line. You can hover your mouse over each line to see what the script is doing

- -

Output

- 
-				$ This is output text.
-
- -

A line that does not begin with a $ is output text that is intended to give you information or tell you what to do next. We've colored output text green in these bootcamp tutorials.

- -

User Specific Input

- 
-				$ echo 'username'Outputs the text in the quote marks.
-
- -

Areas of yellow text represent your own personal info. If it is part of an input ($) line, you should replace your it with your own info when you type it. If it is part of output text, it is just for your reference. It will automatically show your own info in Terminal

- -

Good to know: There will be times when you type code, hit return, and all you are given is another prompt. Some actions that you execute in the Terminal don’t have any output. Don’t worry, if there is ever a problem with your code, Terminal will let you know.

+
+

Need a quick lesson about Git Bash?

+
+

Code blocks like those on this page are part of a scripting language called Bash. To use Bash scripts, we need to use an application that comes with Linux called Terminal.

-

Good to know: For security reasons, Terminal will not display what you type when entering passwords. Just type your password and hit the return key.

- - - +

Input

+ 
+			$ echo 'This is input text'This tooltip tells you what's going on.
+
+ +

A line that begins with the dollar sign ($) indicates a line of Bash script you need to type. To enter it, type the text that follows the $, hitting the return key at the end of each line. You can hover your mouse over each line for an explanation of what the script is doing

+ +

Output

+ 
+			$ This is output text.
+
+ +

A line that does not begin with a $ is output text that is intended to give you information or tell you what to do next. We’ve colored output text green in these bootcamp tutorials.

+ +

User Specific Input

+ 
+			$ echo 'username'Outputs the text in the quote marks.
+
+ +

Areas of yellow text represent your own personal info, repos, etc. If it is part of an input ($) line, you should replace your it with your own info when you type it. If it is part of output text, it is just for your reference. It will automatically show your own info in Git Bash

+ +

Good to know: There will be times when you type code, hit return, and all you are given is another prompt. Some actions that you execute in the Git Bash don’t have any output. Don’t worry, if there is ever a problem with your code, Git Bash will let you know.

+ +

Good to know: For security reasons, Git Bash will not display what you type when entering passwords. Just type your password and hit the return key.

+
+
1. Check for SSH keys. Have an existing kepair? You can skip to Step 4. First, we need to check for existing ssh keys on your computer: 
-	$ cd ~/.sshChecks to see if there is a folder named ".ssh" in you user directory
+	$ cd ~/.sshChecks to see if there is a directory named ".ssh" in your user directory
If it says “No such file or directory“ skip to __step 3__. Otherwise continue to __step 2__. @@ -88,9 +86,9 @@ To make sure you generate a brand new key, you need to check if one already exis 
 	$ lsLists all the subdirectories in the current directory
 	config  id_rsa  id_rsa.pub  known_hosts
-	$ mkdir key_backupMakes a folder called "key_backup" in the current directory
-	$ cp id_rsa* key_backupCopies the contents of the id_rsa folder into key_backup folder
-	$ rm id_rsa*Deletes the contents of the id_rsa folder
+	$ mkdir key_backupMakes a directory called "key_backup" in the current directory
+	$ cp id_rsa* key_backupCopies the contents of the id_rsa directory into key_backup directory
+	$ rm id_rsa*Deletes the contents of the id_rsa directory
3. Generate a new SSH key. @@ -148,12 +146,13 @@ To make sure you generate a brand new key, you need to check if one already exis Don’t worry, this is supposed to happen. Type “yes”. 
-	Warning: Permanently added 'github.com,207.97.227.239' (RSA) to the list of known hosts.
-	ERROR: Hi username! You've successfully authenticated, but GitHub does not provide 
shell access
+	PTY allocation request failed on channel 0
+	Hi username! You've successfully authenticated, but GitHub does not provide shell access.
 	Connection to github.com closed.
+
- - You don’t worry, about the “ERROR”. You actually want to see that. + + Don’t worry, about the “failed” part. All you should about is that you see “You’ve successfully authenticated” ##Then: Set Up Your Info diff --git a/_posts/2011-02-16-create-a-repo.markdown b/_posts/2011-02-16-create-a-repo.markdown index ac8af10..cba62d8 100644 --- a/_posts/2011-02-16-create-a-repo.markdown +++ b/_posts/2011-02-16-create-a-repo.markdown @@ -33,14 +33,14 @@ While a README isn’t a required part of a GitHub repo, it is a good idea t In the prompt, type the following code: 
-	$ mkdir ~/Hello-WorldCreates a folder for your project called "Hello-World" in your user folder
-	$ cd ~/Hello-WorldChanges the active directory in the prompt to your newly created folder
+	$ mkdir ~/Hello-WorldCreates a directory for your project called "Hello-World" in your user directory
+	$ cd ~/Hello-WorldChanges the current working directory to your newly created directory
 	$ git initSets up the necessary Git files
-	Initialized empty Git repository in /Users/your_user_directory/Hello-World/.git/
-	$ touch READMECreates a file called "README" in your Hello-World folder
+	Initialized empty Git repository in /Users/your_user_directory/Hello-World/.git/
+	$ touch READMECreates a file called "README" in your Hello-World directory
- Open the new README file found in your Hello-World folder in a text editor and add the text “Hello World!.” When you are finished, save and close the file. + Open the new README file found in your Hello-World directory in a text editor and add the text “Hello World!.” When you are finished, save and close the file. 2. Commit your README diff --git a/_posts/2011-02-17-fork-a-repo.markdown b/_posts/2011-02-17-fork-a-repo.markdown index 29fd3e4..0ae782d 100644 --- a/_posts/2011-02-17-fork-a-repo.markdown +++ b/_posts/2011-02-17-fork-a-repo.markdown @@ -27,7 +27,7 @@ You’ve successfully forked the Spoon-Knife repo, but so far it only exists Run the following code: 
-	$ git clone git@github.com:username/Spoon-Knife.gitClones your copy of the repo into the current folder in terminal
+	$ git clone git@github.com:username/Spoon-Knife.gitClones your copy of the repo into the current directory in terminal
2. Configure remotes @@ -42,7 +42,7 @@ You’ve successfully forked the Spoon-Knife repo, but so far it only exists ##Then: More Things You Can Do -Congratulations, you’ve successfully forked a repo, but get a load of these other cool things you can do: +You’ve successfully forked a repo, but get a load of these other cool things you can do: - Push commits @@ -89,24 +89,37 @@ Congratulations, you’ve successfully forked a repo, but get a load of thes

How do I use branches?

- +

Branches are pretty easy to work with and will save you a lot of headaches, especially when working with multiple people. To create a branch and begin working in it, use the following script: 

-				$ git branch newbranchCreates a new branch called "newbranch"
-				$ git checkout newbranchMakes "newbranch" the active branch
+				$ git branch mybranchCreates a new branch called "mybranch"
+				$ git checkout mybranchMakes "mybranch" the active branch

Alternatively, you can use the shortcut:

-				$ git checkout -b newbranchCreates a new branch called "newbranch"
+				$ git checkout -b mybranchCreates a new branch called "mybranch" and makes it the active branch

To switch between branches, use checkout.

+ 
+				$ git checkout masterMakes "master" the active branch
+				$ git checkout mybranchMakes "mybranch" the active branch
+
+ +

Once you’re finished working on your branch and are ready to combine it back into the master branch, use merge.

+ + 
+				$ git checkout masterMakes "master" the active branch
+				$ git merge mybranchMerges the commits from "mybranch" into "master"
+				$ git branch -d mybranchDeletes the "mybranch" branch
+
+
diff --git a/_posts/2011-02-18-be-social.markdown b/_posts/2011-02-18-be-social.markdown index 67935fa..f83cbc7 100644 --- a/_posts/2011-02-18-be-social.markdown +++ b/_posts/2011-02-18-be-social.markdown @@ -60,6 +60,18 @@ At some point you may want to stay up-to-date with a specific project. We’ Congratulations! You are now watching the the Hello World project. If the Octocat updates it, you will see what happened in your dashboard. +##Then: More Things You Can Do + +You’ve done some of the most basic social interaction GitHub has to offer, but don’t stop there! Check out these other social features: + +- Pull requests + + If you are hoping to contribute back to the original fork, you can send the original author a [pull request](/pull-requests/). + +- Issues + + When you are collaborating on a project with someone, you some times come across problems that need to be fixed. To help you keep track of these problems, each GitHub repo has a section called Issues. For an example, check out the [issues](https://github.com/octocat/Spoon-Knife/issues) for the Spoon-Knife repo. + ##Lastly: Celebrate Congratulations! You are quite the socialite. What do you want to do next? diff --git a/css/style.css b/css/style.css index 5d7bd66..75100a1 100755 --- a/css/style.css +++ b/css/style.css @@ -131,6 +131,7 @@ pre .codeline:hover span { pre.bootcamp { white-space: normal !important; margin-left: -10px !important; + margin-bottom: 1.5em !important; background-image: none !important; } @@ -215,90 +216,6 @@ pre .codeline:hover em { border: 1px solid #bf6060; } -/****************************/ -/* Explain Pop-up */ -/****************************/ -/* -.explain { - font-style: italic; - color: #4183C4; - cursor: default; - margin: 1em 0px 1em; - position: relative; - display: inline-block; -} - -.explain-it-shell { - display: none; - position: absolute; - width: 667px; - padding: 15px 0 0 0; - top: 2.2em; - font-style: normal; - color: #666666; - margin: -15px 0 0 0; -} - -.explain:hover .explain-it-shell { - display: block; - z-index: 100; -} - -.explain-it-shell span.explain-it { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - background-color: #FFFFFF; - border: 3px solid #DDDDDD; - padding: 1em 2em; - display: block; - -webkit-box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.3); - box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.3); -} - -.explain-it-shell span.explain-it img { - border: 1px solid #DDDDDD; - margin: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - - -.explain .triangle { - display: block; - width:31px; - height:15px; - position: absolute; - top: 3px; - left: 15px; - background-image: url('/images/bootcamp/explain_it_triangle.png'); - background-repeat: no-repeat; - background-position: right 50%; -} - -.explain .account-settings { - left: 70px; -} -.explain .ssh-public-keys { - left: 215px; -} -.explain .add-another-public-key { - left: 400px; -} -.explain .account-admin { - left: 220px; -} - -.explain h4 { - margin-top: 1em; -} - -.explain pre { - margin-left: 0px; -} -*/ /****************************/ /* Bootcamp */ /****************************/ @@ -404,13 +321,15 @@ h2 span { .more-info { margin: 10px 0; + position: relative; } .more-info > h4 { background-image: url('/images/bootcamp/dropdown_sprites.jpg'); background-repeat: no-repeat; - padding: .25em 0 .25em 33px; + padding: .25em 0 .25em 25px; cursor: pointer; color: #4183C4; + font-weight: normal; } .more-info h4.compressed { background-position: 0 0; @@ -445,4 +364,5 @@ h2 span { .more-info .more-content pre { margin-left: 0px !important; -} \ No newline at end of file +} + -- cgit v1.3.1