Skip to content

Commit

Permalink
Merge pull request #178 from joker2600/master
Browse files Browse the repository at this point in the history
some small changes to issues #118 and #170

Thanks @joker2600 appreciate this update!
  • Loading branch information
chalmerlowe authored Apr 13, 2019
2 parents e34006c + c468358 commit 1d2ca7e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
15 changes: 6 additions & 9 deletions class_materials/git_main_lifecycle.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ Changes not staged for commit:
$ git add johnny_appleseed.txt
```

If you need to add more than one file to the staging area, simply separate the filenames with a space:

```bash
$ git add <file1> <file2> ...
```

### Status check
Take a look at things now that the file has been staged, again using `git status`... We should notice that a line in the output identifies that a text file has been modified AND is now ready to be committed.

Expand Down Expand Up @@ -276,15 +282,6 @@ nothing to commit, working tree clean

Get in the habit of using `git status` regularly, it is probably the most informative and helpful command for understanding exactly what's going on.

### Adding multiple files

If you need to add more than one file to the staging area, simply separate the filenames with a space:

```bash
$ git add <file1> <file2> ...
```


## Resources

* [Git Basics - Recording Changes to the Repository](https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository)
Expand Down
2 changes: 1 addition & 1 deletion class_materials/prereq_student.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Having said that, the following will help with successfully completing this work

### Learning methods

The workshop is about four hours and covers a lot of material (it may be broken into two days OR may be a single day event). Anything you can do to optimize your learning experience will be beneficial. Below are just some suggestions:
The workshop is about two hours and covers a lot of material. Anything you can do to optimize your learning experience will be beneficial. Below are just some suggestions:

* Ask questions. Lots of questions.
* Take advantage of the fact that you are in a room with mentors to get your questions answered.
Expand Down

0 comments on commit 1d2ca7e

Please sign in to comment.