Documentation/git-worktree: fix incorrect reference to file "locked"

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 6c3085d72d99e2fdbd013a75c657cc7ee47df71b..efe6a026f132b040cc47d847bbdb4f284c2a0133 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -111,9 +111,6 @@ OPTIONS
 +
 When checking out paths from the index, do not fail upon unmerged
 entries; instead, unmerged entries are ignored.
-+
-By default, checking out a branch already checked out in another worktree
-is disallowed. This overrides that safeguard.
 
 --ours::
 --theirs::
@@ -228,6 +225,12 @@ 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.
 
+--ignore-other-worktrees::
+       `git checkout` refuses when the wanted ref is already checked
+       out by another worktree. This option makes it check the ref
+       out anyway. In other words, the ref can be held by more than one
+       worktree.
+
 <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