Update first part of c1s2 to use sourcetree

Author: tomclose

_sessions/c1s2/1_using_git.md

@@ -2,36 +2,90 @@
 title:  "Intro to Git"
 ---
 
+Git is a version control system. It allows you to keep the entire history of your code, and makes it easy to share and collaborate with others.
+
+To use git you need to create a **Git repository**. You can think of a git repository like this:
+
 ![Basic git](/assets/basic_git.png)
 
-Git is a version control system. It allows you to keep the entire history of your code, and makes it easy to share and collaborate with others.
+- A repository contains lots of **commits**. Each commit is essentially a different version of your files.
+- Commits can be organised into **branches**. A repository can contain many different branches. Branches are often used to develop new application features - that way the main codebase still works while the feature is being developed, and the new code can be *merged* in when it's working.
+- Branches have names, so you can keep track of them. When you first set up a repository, you'll just have one branch and it will have the default name - **master**.
 
-### Setting up a git repo
+### What does a git repository look like?
 
-Git works on a folder level. To set up a folder to work with git you need to open up the github app and select `File > Add Local Repository ...`. You then need to select the folder you want to control with git.
+On your laptop, a git repository is just a **special type of folder**. Any folder can be made into a git repository (but not all folders should - e.g. don't make your entire documents directory into a git repository, you'll run into problems). You'll normally make a new git repository for each coding project you work on.
 
-### Excluding some files
+If you look inside the folder, you won't see all the different versions stored there (they are actually there - just stored inside a hidden folder called `.git`) - you'll only see the files that are in your **working copy**. Normally this working copy will contain the files from the last commit on the master branch, along with any changes you've made.
 
-There are some other hidden files (e.g. those used by your operating system) that you don't want to be version controlled. An example of these is the `.DS_Store` file on macs. We'll talk more about this later - for now we'll just quickly exclude them from our repository.
+### Making a commit
 
-To do this you need to change the settings on your repository.
+To save some changes into the repository you need to create a commit. When you create a commit you get to write a message, to help remind yourself (and others) what changes you made (and why you made them). Once you've created a commit, you'll be able to come back to this version of your code at any point in the future.
 
-1. Open the settings tab of your repository.
-2. Add `.DS_Store` on the first line of the 'Ignored files' section, and press 'Save Changes'.
+Adding files to a git repository is actually a two-stage process: first you have to **add** them to something called the **index** and then you have to **commit** them. This is useful when you get more advanced, but we'll usually do those things together for the time being.
 
-If you're on Windows you don't need to worry about this.
+![Index and working tree](/assets/index_working_tree.png)
 
-### Committing files to the repository
+{% exercise %}
+1. Set up your `first_site` folder as a git repository.
+2. **Add** your work to the index.
+3. **Commit** your work to the repository, with a message e.g. "Initial import"
+4. Make some change to index.html (in Sublime Text)        
+5. **Add** your changes to the index.
+6. **Commit** them to the repository.
+{% endexercise %}
 
-Suppose we've now created a file called `index.html` in the folder. It's in the folder but currently isn't being tracked by git. 
 
-Adding files to a git repository is actually a two-stage process: you have to **add** them and then **commit** them. This is useful when you get more advanced, but we'll usually do those things together for the time being. 
+### Git with SourceTree
 
+#### Creating a git repository
 
-{% exercise %}
-1. Set up your `first_site` folder as a git repository: open up the github app, select `File > Add Local Repository ...` and select the `first_site` folder.
-2. **If you are on a mac**, tell git to ignore your `.DS_Store` files: in the settings panel of the github app, add the line `.DS_Store` in the 'Ignored files' section.
-3. Commit your work to the repository: in the 'Changes' panel, click 'Select all', write a 'Commit Summary' in the box (e.g. "Created index.html") and click 'Commit'.
-6. Make some change to index.html (in Sublime Text)        
-7. Go back to the 'Changes' panel. Select and commit your changes, with a 'Commit Summary' describing what you did.
-{% endexercise %}
+1. Open SourceTree
+2. Select File > New / Clone
+3. Select the 'New' option
+4. Navigate to the folder you want to make into a git repository.
+
+#### Adding to the index
+
+1. Select all the files in the working tree section.
+2. Click the "Add" button at the top.
+3. You should see the files move to the 'Index' section
+
+#### Committing to the repository
+
+1. Once you have files in your 'Index' section, click on 'Commit'.
+2. Write a commit message explain what you've done (and maybe why).
+3. Click "Commit"
+
+### Git with the command line
+
+#### Creating a git repository
+
+1. Using the command line, navigate to the folder you want to make into a repository.
+2. **Inside the target folder** run the command
+
+        git init
+
+3. To check this worked run the command
+
+        git status
+
+#### Adding to the index
+
+1. Inside the folder, run the command
+
+        git add --all
+
+3. To check this worked run the command
+
+        git status
+
+#### Committing to the repository
+
+1. Inside the folder, run the command
+
+        git commit -m "write your message here"
+
+3. To check this worked run the command
+
+        git status

_sessions/c1s2/2_pushing_to_github.md

@@ -2,7 +2,6 @@
 title: Pushing code to Github
 ---
 
-
 Github is a site which will host a git repo online for you, making it easy to collaborate with others. We'll now see how to put some code online.
 
 ### Aside: serving a site via Github Pages
@@ -24,4 +23,9 @@ To push code up to GitHub, in the GitHub app select the 'Push to Github' button
 3. On Github check you can see your `first_site` code.
 4. On the code page on github, click on Settings. It should tell you (about half way down) the url where they've published your site. Have a look to see whether you can see it!
 5. (If you finish early) Make a change to `index.html` in Sublime Text. Commit the change to the repository and then push it to GitHub. Make sure you can see the change in the code on GitHub and also in the published page.
-{% endexercise %}
+{% endexercise %}
+
+### Creating a git repository, adding and committing with Source Tree
+
+#### To 
+