On Thu, Dec 20, 2018 at 2:48 PM Thomas Gummerer <t.gummerer@xxxxxxxxx> wrote: > diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt > index 801de2f764..4ac8c55865 100644 > --- a/Documentation/git-checkout.txt > +++ b/Documentation/git-checkout.txt > @@ -260,6 +260,9 @@ the conflicted merge in the specified paths. > This means that you can use `git checkout -p` to selectively discard > edits from your current working tree. See the ``Interactive Mode'' > section of linkgit:git-add[1] to learn how to operate the `--patch` mode. > ++ > +Note that this option uses the no overlay mode by default (see also > +-`--[no-]overlay`), and currently doesn't support overlay mode. > > --ignore-other-worktrees:: > `git checkout` refuses when the wanted ref is already checked > @@ -276,6 +279,13 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode. > Just like linkgit:git-submodule[1], this will detach the > submodules HEAD. > > +--[no-]overlay:: > + In the default overlay mode files `git checkout` never -ECANTPARSE. Maybe "files" should be removed from this line? > + removes files from the index or the working tree. When > + specifying --no-overlay, files that appear in the index and > + working tree, but not in <tree-ish> are removed, to make them > + match <tree-ish> exactly. > + > <branch>:: > Branch to checkout; if it refers to a branch (i.e., a name that, > when prepended with "refs/heads/", is a valid ref), then that -- Duy
