Merge branch 'nb/worktree-api-doc'

diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index e85148f05eb79a968ad84bac6ce7a88289270c49..36fcca80875b524480ca97be5ef668886c29eabb 100644 (file)
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -143,6 +143,11 @@ config::
        if $GIT_COMMON_DIR is set and "$GIT_COMMON_DIR/config" will be
        used instead.
 
+config.worktree::
+       Working directory specific configuration file for the main
+       working directory in multiple working directory setup (see
+       linkgit:git-worktree[1]).
+
 branches::
        A slightly deprecated way to store shorthands to be used
        to specify a URL to 'git fetch', 'git pull' and 'git push'.
@@ -275,6 +280,9 @@ worktrees/<id>/locked::
        or manually by `git worktree prune`. The file may contain a string
        explaining why the repository is locked.
 
+worktrees/<id>/config.worktree::
+       Working directory specific configuration file.
+
 SEE ALSO
 --------
 linkgit:git-init[1],