git-format-patch.txt: document --no-notes option

diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index e85148f05eb79a968ad84bac6ce7a88289270c49..216b11ee88f4e9c5b10278e037f3b1c51173bc6d 100644 (file)
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -84,7 +84,7 @@ objects/info/alternates::
        to the object database, not to the repository!) in your
        alternates file, but it will not work if you use absolute
        paths unless the absolute path in filesystem and web URL
-       is the same. See also 'objects/info/http-alternates'.
+       is the same. See also `objects/info/http-alternates`.
 
 objects/info/http-alternates::
        This file records URLs to alternate object stores that
@@ -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
@@ -275,6 +287,11 @@ 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.
+
+include::technical/repository-version.txt[]
+
 SEE ALSO
 --------
 linkgit:git-init[1],