Skip to content

Commit 4061473

Browse files
authored
Merge pull request #1109 from gray95/checkout-context
Add note on 'git restore' to Instructor Notes
2 parents 9ce6870 + 2c36f05 commit 4061473

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

instructors/instructor-notes.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,10 @@ working in teams or not, because it is
158158
- This is a good moment to show a log within a Git GUI. If you skip it
159159
because you're short on time, show it once in GitHub.
160160

161+
## [Exploring History](../episodes/05-history.md)
162+
163+
- Git 2.23 (August 2019) added the `git restore` command as a clearer, more verbose replacement for the heavily overloaded `git checkout` when you wish to restore files into the working tree. The older style `git checkout -- file` does still work in newer versions of Git. This is an illustration of the fact that there are often multiple ways to do the same thing in Git.
164+
161165
## [Ignoring Things](../episodes/06-ignore.md)
162166

163167
Just remember that you can use wildcards and regular expressions to ignore a

0 commit comments

Comments
 (0)