Skip to content

Commit 2ee5646

Browse files
committed
update copy
1 parent 82a2d9f commit 2ee5646

4 files changed

Lines changed: 43 additions & 20 deletions

File tree

docs/tut/1-1-command-line.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Using the command line requires you to pay close attention to spacing and case (
2222

2323
We will be using the command line to install some programs, and communicate with our online repository which holds our documentation.
2424

25-
## How to access you command online
25+
## How to access your command online
2626

2727
We will be using a unix based command line, as this is consistently available across unix/linux systems (for example high performance computing clusters), Mac OS and Windows OS.
2828

@@ -36,7 +36,7 @@ From Windows 10 onwards you can access a unix command line using the application
3636

3737
## Basic command line tutorial
3838

39-
Launch your command line application and have a go at completing [Unix Tutorial 1 from the University of Surrey](http://www.ee.surrey.ac.uk/Teaching/Unix/unix1.html). [Tutorial 2 (up to rmdir)](http://www.ee.surrey.ac.uk/Teaching/Unix/unix2.html) will also be helpful.
39+
Launch your command line application and have a go at completing [Unix Tutorial 1 from the University of Surrey](http://www.ee.surrey.ac.uk/Teaching/Unix/unix1.html). [Tutorial 2 (up to rmdir)](http://www.ee.surrey.ac.uk/Teaching/Unix/unix2.html) will also be helpful for what we're aiming to achieve.
4040

4141
After you have completed these tutorials, you should be able to do this via command line:
4242

docs/tut/2-1-install-git.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,13 @@ has_children: false
1111
# Install git
1212
{: .fs-8 }
1313

14-
Make your github account
14+
Install git on your computer
1515
{: .fs-6 .fw-300 }
1616

1717
---
18+
19+
Git is a system for tracking and recording changes to files. More concretely, git takes a "snapshot" of your files every time you "commit" them to your repository. If the files have not changed, git stores a link to the previous snapshot rather than recording a new one. This is a system of version control. Importantly allows you to keep a very explicit record of what has changed , and when, and revert to earlier versions if necessary.
20+
21+
Git was developed to allow distributed teams to work on vast repositories of code simultaneously without stepping on each others toes. The code is held in one central repository, and others are invite to access it (or "contribute" to it) from wherever they are. Imagine trying to write and test a computer program by emailing round a document with track changes?! Wouldn't be pretty.
22+
23+
Some computers come with git pre-installed. On others you will need to install it yourself. Follow these instructions to [install git on your computer](https://github.com/git-guides/install-git).

docs/tut/2-2-configure-git.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
layout: default
3+
title: 2.2 Configure git
4+
nav_order: 2
5+
grand_parent: Tutorials
6+
parent: 2. Starting with GitHub
7+
has_children: false
8+
---
9+
10+
11+
# Configure git
12+
{: .fs-8 }
13+
14+
Configure git on your system (one time only)
15+
{: .fs-6 .fw-300 }
16+
17+
---
18+
19+
Now you have git installed, you need to set a few variables so git knows who you are and who is making changes to your documentation!
20+
21+
Open your command line application and enter the below, one line at a time (press return after each line). replace "Your Name" with your actual name...
22+
23+
```
24+
git config --global user.name "Your Name"
25+
git config --global user.email your-email-address@example.com
26+
git config --global core.editor=atom --wait
27+
28+
```
29+
30+
You can then list the contents of your git config file using the command below, and check the above variables have been stored.
31+
32+
```
33+
git config --list
34+
```

docs/tut/2-2-first-time-git-setup.md

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)