From f65b3afd329fbd333164d46de428de15a0076526 Mon Sep 17 00:00:00 2001 From: Andree Valle Campos Date: Sun, 12 Nov 2023 00:56:23 +0000 Subject: [PATCH] replace link to read about undoing commits changes --- episodes/05-history.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/episodes/05-history.md b/episodes/05-history.md index 5135f5edb..c32de6ed8 100644 --- a/episodes/05-history.md +++ b/episodes/05-history.md @@ -458,7 +458,7 @@ else has committed changes to the repository. Commands like `git checkout` and `git revert` are useful but so similar that it's very easy to mix them up! -With the concepts learned in this episode, we invite you to read this chapter on [resetting, checking out and reverting](https://www.atlassian.com/git/tutorials/resetting-checking-out-and-reverting). +With the concepts learned in this episode, we invite you to read this chapter on [undoing commits and changes](https://www.atlassian.com/git/tutorials/undoing-changes). ::::::::::::::::::::::::: @@ -652,6 +652,12 @@ $ git log --patch HEAD~9 *.Rmd :::::::::::::::::::::::::::::::::::::::::::::::::: +::::::::::::::::: checklist + +[Use `git diff` to compare changes since last commit or between commits. Use `git checkout` to undo changes by restoring the staging area (committed changes) or the local repository (last commit)](cut-git-verb_map-08.png) + +::::::::::::::::::::::::::: + :::::::::::::::::::::::::::::::::::::::: keypoints - `git diff` displays differences between commits.