Merge branch 'js/config-sequence'

diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index adf9554ad2f84cb69a6b0a940e4d3e0e336df9ff..d501af9d776edc6890aeea51e3581a3f9bb22049 100644 (file)
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -95,8 +95,10 @@ refs::
        References are stored in subdirectories of this
        directory.  The 'git prune' command knows to preserve
        objects reachable from refs found in this directory and
-       its subdirectories. This directory is ignored if $GIT_COMMON_DIR
-       is set and "$GIT_COMMON_DIR/refs" will be used instead.
+       its subdirectories.
+       This directory is ignored (except refs/bisect and
+       refs/worktree) if $GIT_COMMON_DIR is set and
+       "$GIT_COMMON_DIR/refs" will be used instead.
 
 refs/heads/`name`::
        records tip-of-the-tree commit objects of branch `name`
@@ -143,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'.
@@ -165,6 +172,11 @@ hooks::
        each hook. This directory is ignored if $GIT_COMMON_DIR is set
        and "$GIT_COMMON_DIR/hooks" will be used instead.
 
+common::
+       When multiple working trees are used, most of files in
+       $GIT_DIR are per-worktree with a few known exceptions. All
+       files under 'common' however will be shared between all
+       working trees.
 
 index::
        The current index file for the repository.  It is
@@ -208,6 +220,10 @@ info/exclude::
        'git clean' look at it but the core Git commands do not look
        at it.  See also: linkgit:gitignore[5].
 
+info/attributes::
+       Defines which attributes to assign to a path, similar to per-directory
+       `.gitattributes` files.   See also: linkgit:gitattributes[5].
+
 info/sparse-checkout::
        This file stores sparse checkout patterns.
        See also: linkgit:git-read-tree[1].
@@ -271,10 +287,8 @@ worktrees/<id>/locked::
        or manually by `git worktree prune`. The file may contain a string
        explaining why the repository is locked.
 
-worktrees/<id>/link::
-       If this file exists, it is a hard link to the linked .git
-       file. It is used to detect if the linked repository is
-       manually removed.
+worktrees/<id>/config.worktree::
+       Working directory specific configuration file.
 
 SEE ALSO
 --------