Adding set-up images and updated tutorial pages for Git

Author: MarkCBJSS

version-control/command-line/tutorial.md

@@ -15,14 +15,14 @@ The following set of examples will help you understand how to use Git via the co
 
 
 ### Create and add your project in Git
-To start, let's make a directory to store our files and initialise the directory as a Git repository on our local system.
+To start, let's make a directory to store our files and initialise the directory as a Git repository on our local system. This is the same as we did in the [Set-up tutorial]((../set-up/tutorial.html)) previously.
 
 ```bash
 $ mkdir practising-git
 $ cd practising-git
 $ git init
 ```
-> The first command above will make a new directory (`mkdir`) at the system location you're at within the terminal window. The second command will change directory (`cd`) into the new one you just made. The third command will call the Git program then initialise (`init`) your directory as a local Git repository.
+> You may recall this will make the directory, change directory so we're located in it, then initialise it as an empty Git repository.
 
 ### Create a file.
 We can create a new file in our local directory and add a line to it at the same time, with the below.

version-control/set-up/images/setup-pid-number.png

@@ -5,29 +5,149 @@ title: Set-up Git and GitHub
 
 ## Introduction to Git and GitHub
 -----
-Now that we know what Version Control is, let's get set-up with Git on our system and make sure we're ready to start creating our own projects and contributing to others.
+Now that we know what Version Control is, let's get set-up with Git and Github on our system and make sure we're ready to start creating our own projects and contributing to others.
 
-## Before you begin
-Install command line Git for your operating system ([OS X](https://sourceforge.net/projects/git-osx-installer/), [Windows](http://msysgit.github.io/) or [Linux](https://git-scm.com/download/linux)) and open your terminal / command prompt.
+## Install and Set-up Git
+Install command line Git for your operating system ([OS X](https://sourceforge.net/projects/git-osx-installer/), [Windows](http://msysgit.github.io/) or [Linux](https://git-scm.com/download/linux)) and open a terminal / command prompt.
 
-Download [Github Desktop](https://desktop.github.com/) for Mac or Windows.
+Once installed check Git commands works by typing the following in the terminal window.
 
-Now create a directory where you will be storing all your projects. You can call it something obvious such as `code` or `projects`.
+```bash
+$ git --version
+```
+This will return the version of Git you've installed and prove it's up and running correctly.
 
-### Set-up your Account Git details
-When we make a commit to a respository we need to associate it with ourselves. To do that we can tell Git our Github account username and email address
+> Later in the tutorial we'll download [Github Desktop](https://desktop.github.com/).
 
-commits 
-To associate commits you make to repositories to yourself, we need to set-up a Username 
+### Create an empty Git repository
+Now create a directory where you will be storing all your projects, by typing the following lines and hitting enter after each. You can call the directory whatever you prefer, such as `code` or `projects`.
+
+```bash
+$ mkdir practising-git
+$ cd practising-git
+$ git init
+```
+
+> The first command above will make a new directory (`mkdir`) at the system location you're at within the terminal window. The second command will change directory (`cd`) into the new one you just made. The third command will call the Git program then initialise (`init`) your directory as a local Git repository
+
+### Set-up your Git account details
+When we make a commit to a respository we need to associate it with ourselves. To do that we can tell Git our Github account username and email address. Type the following lines in the terminal window.
 
 ```bash
 $ git config --global user.name "Your Name"
 $ git config --global user.email "name@domain"
 ```
 
-### Setup an SSH key
+### Set-up a SSH keys
+In order to connect to and work with the host of a remote repository you'll need a way to prove who you are before a secure connection is allowed. If you think you may already have SSH keys set-up or just want to see what you have in place, use the following command.
+
+```bash
+$ ls -al ~/.ssh
+```
+> Notice this is a command line statement, not a Git statement.
+> In the consoole window look for files named `id_rsa` and `id_rsa_pub`
+
+There are two files to be generated as one is the Private Key that resides on your system and the other is the Public Key that can be shared and added to various services, such as Github, as the other part to authenticate you with.
+
+**# Generate SSH Key Pairs**
+
+Open a terminal window and enter the following command.
+
+```bash
+ssh-keygen -t rsa -b 4096 -C "[email protected]"
+```
+
+When prompted to `Enter file in which to save the key`, just hit `[ENTER]` on your keyboard to accept the location shown. If there are already keys in that location you'll be asked if you want to overwrite them. Hit `y` or `n` as appropriate.
+
+You'll then be asked to `Enter passphrase` and to reconfirm it - choose a secure one - then hit `[ENTER]` after each prompt and the keys will be generated, along with your password and email as a label.
+
+![RSA Keys Generated](images/setup-rsa-key-generated.png)
+
+**# Add SSH Keys to the ssh-agent**
+
+To avoid having to provide a password every time we connect to a service we can use the ssh-agent on our system. This agent handles passwords for ssh private keys and connections to the remote service we're logging into. This avoids having to send passwords over the network to the service.
+
+Check if the ssh-agent running by typing the following command
+
+```bash
+eval "$(ssh-agent -s)"
+```
+This should return the PID for the ssh-agent which means it has been started in the background.
+
+![PID Number](images/setup-pid-number.png)
+
+Now add the ssh keys to the ssh-agent by typing one of the following depending on your system.
+```bash
+Windows:  ssh-add ~/.ssh/id_rsa 
+    Mac:  ssh-add -K ~/.ssh/id_rsa
+```
+> The -K option is Apple's version of `ssh-add` which adds the passphrase to your keychain for when you add the key to the ssh-agent
+
+You can check what identities have been added to the ssh-agent by typing:
+```bash
+ssh-add -l
+```
+
+### aaaaaaa
+.
 
-An SSH key is used to identify trusted computers, without entering a password.
 [Instructions on how to generate an SSH key](https://git-scm.com/book/en/v2/Git-on-the-Server-Generating-Your-SSH-Public-Key)
 
+
+.
+
+.
+
+.
+
+.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+.
+
+.
+
 This ends our _Set-up Git and GitHub_ lesson. Is there something you don't understand? Try and go through the provided resources with your coach. If you have any feedback or can think of ways to improve this tutorial [send us an email](mailto:[email protected]) and let us know.