"Julia Evans via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > From: Julia Evans <julia@xxxxxxx> > > - Many users do not understand the terms "index" or "pathspec". Clarify > in the intro by using an example, so that users can understand the > basic idea without learning the full definition of "pathspec". > - Use the terminology "Switch" and "Restore" to mirror `git switch` > and `git restore` > - Reference (and clarify) the ARGUMENT DISAMBIGUATION section Avoid bullet points here. End your sentence with a full stop. > -Updates files in the working tree to match the version in the index > -or the specified tree. If no pathspec was given, `git checkout` will > -also update `HEAD` to set the specified branch as the current > -branch. > +`git checkout` has two main modes: > + > +1. **Switch branches**, with `git checkout <branch>` > +2. **Restore a different version of a file**, for example with `git > + checkout <commit> <filename>` or `git checkout <filename>` > + > +See ARGUMENT DISAMBIGUATION below for how Git decides which one to do. As promised in the proposed log message, this conveys the same information much more clearly. "A different version of" neatly sidesteps the need to hint we can check out paths from a tree or the index. "Restore a different version of files" (or "files from a different version") perhaps? The point being you can grab multiple with a single operation, but they all have to come from a single source. Other than that, very nicely done. > +Here's a description of all of the modes: I am not sure if we want/need this line, though. > `git checkout [<branch>]`:: > To prepare for working on _<branch>_, switch to it by updating > @@ -511,14 +515,17 @@ $ git log -g -2 HEAD > ARGUMENT DISAMBIGUATION > ----------------------- > > -When there is only one argument given and it is not `--` (e.g. `git > -checkout abc`), and when the argument is both a valid _<tree-ish>_ > -(e.g. a branch `abc` exists) and a valid _<pathspec>_ (e.g. a file > -or a directory whose name is "abc" exists), Git would usually ask > -you to disambiguate. Because checking out a branch is so common an > -operation, however, `git checkout abc` takes "abc" as a _<tree-ish>_ > -in such a situation. Use `git checkout -- <pathspec>` if you want > -to checkout these paths out of the index. > +When you run `git checkout <something>`, Git tries to guess whether > +`<something>` is intended to be a branch, a commit, or a set of file(s), > +and then switches branches, switches commits, or restores the files. > + > +If there's a conflict, you can use the double dash `--` to distinguish > +between branches and files: I do not think you are dealing with a conflict here, rather ambiguity. "You can use double-dash `--` to disambiguate between branches and paths". > +* `git checkout <branch> --` will force Git to treat the parameter as a > + branch name or commit > +* `git checkout -- <pathspec>` will force Git to treat the parameter as > + a set of file(s) We do not have to teach the full pathspec syntax here, but I wonder if we should do something to avoid leading a new reader into thinking they have to list files. "...as a set of files and/or directories", perhaps?
