Recommend Use of git restore When Working With Files

[vermiceli]

Provides alternative examples using git restore for git reset commands that deal with restoring files from the worktree or index.

I believe this better aligns with the documentation, in particular Reset, restore and revert

git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit.

git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history.

[jvns]

I think this would be a good use of the "OR", like with "Delete unstaged changes to one file:" where we show both how to use git checkout and git restore.

I'm also curious about your experience with git restore -- do you yourself find it easier to use than git reset?

My impression is that many Git users (including me!) aren't really familiar with git restore yet, and giving both the "old" and "new" way to do it would help folks understand the new syntax.

[vermiceli]

@jvns Good callout about using OR. Perhaps I was too aggressive in removing the reset version. My thinking was that a cheatsheet shouldn't have a lot of mental overhead or choices, but I understand the prevalence of reset and the novelty of the restore commands for these use cases.

I've added the original reset commands and put the restore version below with an OR.

I'm also curious about your experience with git restore -- do you yourself find it easier to use than git reset?

My impression is that many Git users (including me!) aren't really familiar with git restore yet, and giving both the "old" and "new" way to do it would help folks understand the new syntax.

I'm similar to you. I felt I owed it to myself to review git commands and read the documentation more carefully to understand git more intimately. After reading, I now try my best to use the newer commands like switch and restore. I like the new commands as they are clearer, if not a little more verbose. I'm getting more consistent about using them now, but sometimes typing habits are hard to break.

The idea behind this PR is to align the documentation with the cheat sheet. I think adding the OR is a good gentle introduction to use cases for restore.