Merge branch 'js/mingw-res-rebuild'

diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index 89b616e0491ed7ee760ae934311777f9eb833be7..d501af9d776edc6890aeea51e3581a3f9bb22049 100644 (file)
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -145,6 +145,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'.
@@ -282,6 +287,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],