Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small fixes suggested by Dimitrios #1054

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions episodes/04-changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,7 @@ If we break it down into pieces:
After reviewing our change, it's time to commit it:

```bash
$ git commit -m "Add basic guacamole's ingredients"
$ git status
$ git commit -m "Add ingredients for basic guacamole"
```

```output
Expand All @@ -298,11 +297,11 @@ Let's fix that:

```bash
$ git add guacamole.md
$ git commit -m "Add basic guacamole's ingredients"
$ git commit -m "Add ingredients for basic guacamole"
```

```output
[main 34961b1] Add basic guacamole's ingredient
[main 34961b1] Add ingredients for basic guacamole
1 file changed, 3 insertions(+)
```

Expand Down Expand Up @@ -467,7 +466,7 @@ commit 34961b159c27df3b475cfe4415d94a6d1fcd064d
Author: Alfredo Linguini <[email protected]>
Date: Thu Aug 22 10:07:21 2013 -0400

Add basic guacamole's ingredients
Add ingredients for basic guacamole

commit f22b25e3233b4645dabd0d81e651fe074bd8e73b
Author: Alfredo Linguini <[email protected]>
Expand Down Expand Up @@ -537,7 +536,7 @@ $ git log --oneline

```output
005937f (HEAD -> main) Modify guacamole to the traditional recipe
34961b1 Add basic guacamole's ingredients
34961b1 Add ingredients for basic guacamole
f22b25e Create a template for recipe
```

Expand All @@ -553,7 +552,7 @@ $ git log --oneline --graph

```output
* 005937f (HEAD -> main) Modify guacamole to the traditional recipe
* 34961b1 Add basic guacamole's ingredients
* 34961b1 Add ingredients for basic guacamole
* f22b25e Create a template for recipe
```

Expand Down
1 change: 0 additions & 1 deletion episodes/05-history.md
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,6 @@ the version of `ketchup.md` committed to the repository is the one from the stag
has only one line.

At this time, the working copy still has the second line (and

`git status` will show that the file is modified). However, `git restore ketchup.md`
replaces the working copy with the most recently committed version of `ketchup.md`.
So, `cat ketchup.md` will output
Expand Down
8 changes: 4 additions & 4 deletions episodes/06-ignore.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,9 @@ You would add the following two lines to your .gitignore:

The exclamation point operator will include a previously excluded entry.

Note also that because you've previously committed `.png` files in this
lesson they will not be ignored with this new rule. Only future additions
of `.png` files added to the root directory will be ignored.
Note also that, if you've previously committed `.png` files in this
lesson, they will not be ignored with this new rule. Only future additions
of `.png` files to the root directory will be ignored.



Expand Down Expand Up @@ -261,7 +261,7 @@ receipts/plots
```

What's the shortest `.gitignore` rule you could write to ignore all `.dat`
files in `result/data/market_position/gps`? Do not ignore the `info.txt`.
files in `receipts/data/market_position/gps`? Do not ignore the `info.txt`.

::::::::::::::: solution

Expand Down
4 changes: 2 additions & 2 deletions learners/discuss.md
Original file line number Diff line number Diff line change
Expand Up @@ -367,15 +367,15 @@ If you forgot to use Git and you used Unix `mv` instead
of `git mv`, you will have a touch more work to do but Git will
be able to deal with it. Let's try again renaming the file,
this time with Unix `mv`. First, we need to recreate the
`krypton.txt` file:
`whitesauce.md` file:

```bash
$ echo "Very fun recipe to do" > whitesauce.md
$ git add whitesauce.md
$ git commit -m 'Add white sauce recipe'
```

Let us rename the file and see what Git can figured out by itself:
Let us rename the file and see what Git can figure out by itself:

```bash
$ mv whitesauce.md bechamel.md
Expand Down
Loading