Undoing things: Clarify what "git checkout" does to local files

[rpjday]

The current explanation of "git checkout -- " seems a bit
vague, so expand on it ever so slightly.

Signed-off-by: Robert P. J. Day rpjday@crashcourse.ca

[ben]

Nice, thanks!

[bripmccann]

Maybe I'm being unnecessarily picky, because the meaning is clear, but 'over top of' sounds odd to me. Certainly 'on top of' is the more common idiom—but in the case of copying, the old wording, 'copy over', seems to be the most common.

But like I said, the meaning is still clear. I don't find 'copy over' vague, but if it does add clarity for others I'd say it's worth a little awkwardness.

(P.S. I don't know if people usually comment on pull requests after they're merged? My bad if I should've opened an issue or something.)

---

ETA: I just realized that 'copy over' can also mean 'copy from one thing to another', and that was probably your concern.

Now that I think about it, what about getting rid of the word 'copy' altogether and using 'replace' instead?

[ben]

I'd agree that it isn't that common, and it definitely feels a bit odd to me saying it out loud, but it does get the point across, and I don't think anybody will misread that passage to mean something else.

Do you want to submit a PR so we can see what it looks like?

[HonkingGoose]

Hi @ben, you've merged PR #1246, doesn't that close this issue pull-request? Or is there more work to be done here still?

[aollier]

@HonkingGoose Which issue are you talking about?

[HonkingGoose]

Hi @aollier,

• This issue Pull-Request was first about: Undoing things: Clarify what "git checkout" does to local files #1179 (comment)
• And then about: Undoing things: Clarify what "git checkout" does to local files #1179 (comment)

It seems that both those things are now fixed merged, so this issue Pull-Request (#1179) can be closed?

---

Edit: @aollier I was mistaken, this comment is not about a (new) issue but about this Pull-Request, I was thinking that I was commenting in a issue-report, instead of commenting in a Pull-Request. Sorry for confusing things! 😟

[aollier]

@HonkingGoose Good.
Reminder: if you add a new commit or open a new pull request in order to close an issue, the recommended way of doing it is by closing issues using keywords.

Furthermore, if you work on Windows and are using TortoiseGit, you can see the issue related to the commit if the commit contains one of the keywords followed by # followed by the issue ID thanks to #1127.

[bripmccann]

My commit message for PR #1246 was ambiguous. You'd usually be right to assume I was referencing an issue, not a different pull request. I've edited the commit message to clarify.