Merge branch 'hi/gpg-mintrustlevel'

[thirdparty/git.git] / Documentation / gitrepository-layout.txt

diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index 366dee238c22486a5a934c4184eaafb1723db4e2..1a2ef4c15055a20eaa65cbbf0f40525ba7e2ba48 100644 (file)
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -59,7 +59,7 @@ objects/[0-9a-f][0-9a-f]::
        here are often called 'unpacked' (or 'loose') objects.
 
 objects/pack::
-       Packs (files that store many object in compressed form,
+       Packs (files that store many objects in compressed form,
        along with index files to allow them to be randomly
        accessed) are found in this directory.
 
@@ -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
@@ -96,9 +96,9 @@ refs::
        directory.  The 'git prune' command knows to preserve
        objects reachable from refs found in this directory and
        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.
+       This directory is ignored (except refs/bisect,
+       refs/rewritten 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`
@@ -240,8 +240,8 @@ remotes::
 logs::
        Records of changes made to refs are stored in this directory.
        See linkgit:git-update-ref[1] for more information. This
-       directory is ignored if $GIT_COMMON_DIR is set and
-       "$GIT_COMMON_DIR/logs" will be used instead.
+       directory is ignored (except logs/HEAD) if $GIT_COMMON_DIR is
+       set and "$GIT_COMMON_DIR/logs" will be used instead.
 
 logs/refs/heads/`name`::
        Records all changes made to the branch tip named `name`.