Skip to content

Commit 4e4b74e

Browse files
author
Michelle Tilley
committed
Merge branch 'master' of github.com:git-school/workshop-setup
2 parents f4ab85b + 9992600 commit 4e4b74e

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

Diff for: .gitmodules

+6
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,9 @@
77
[submodule "install-git"]
88
path = install-git
99
url = https://github.com/git-school/installing-git.git
10+
[submodule "workshop-reference"]
11+
path = workshop-reference
12+
url = https://github.com/git-school/workshop-reference.git
13+
[submodule "three-trees-of-git"]
14+
path = three-trees-of-git
15+
url = https://github.com/git-school/three-trees-of-git.git

Diff for: README.md

+11-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ Git Workshop Setup
33

44
Hello! To prepare for the workshop, we ask that you please do the following two things:
55

6-
1. Get the Materials
6+
1. Get the Software
7+
-------------------
8+
9+
Please make sure you have an appropriate installation of Git installed! You should be able to access it from your computer's command line application. Follow the instructions in [the Installing Git repository](https://github.com/git-school/installing-git) for more detailed instructions.
10+
11+
2. Get the Materials
712
--------------------
813

914
### Clone the Repository
@@ -21,10 +26,11 @@ Once cloned correctly, you should have additional subfolders inside the clone re
2126
A day or two before the workshop, please take a moment to pull down the latest changes so everything is up to date. From inside the cloned repository, run:
2227

2328
```
24-
git submodule update --init --recursive
29+
git pull
2530
```
2631

27-
2. Get the Software
28-
-------------------
32+
and then
2933

30-
Please make sure you have an appropriate installation of Git installed! Follow the instructions in [the Installing Git repository](https://github.com/git-school/installing-git) for more detailed instructions.
34+
```
35+
git submodule update --init --recursive
36+
```

Diff for: three-trees-of-git

Submodule three-trees-of-git added at 1dd8f07

Diff for: workshop-reference

Submodule workshop-reference added at 8ab3737

0 commit comments

Comments
 (0)