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

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 922072596fdd80eaaa47746fba5e5591223c5108..2700a1bb834050036d074c9f9b6058aa212344ee 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -393,6 +393,8 @@ false), while all other repositories are assumed to be bare (bare
 
 core.worktree::
        Set the path to the root of the working tree.
+       If GIT_COMMON_DIR environment variable is set, core.worktree
+       is ignored and not used for determining the root of working tree.
        This can be overridden by the GIT_WORK_TREE environment
        variable and the '--work-tree' command-line option.
        The value can be an absolute path or relative to the path to
@@ -1227,6 +1229,13 @@ gc.pruneexpire::
        "now" may be used to disable this  grace period and always prune
        unreachable objects immediately.
 
+gc.pruneworktreesexpire::
+       When 'git gc' is run, it will call
+       'prune --worktrees --expire 3.months.ago'.
+       Override the grace period with this config variable. The value
+       "now" may be used to disable the grace period and prune
+       $GIT_DIR/worktrees immediately.
+
 gc.reflogexpire::
 gc.<pattern>.reflogexpire::
        'git reflog expire' removes reflog entries older than