Merge branch 'maint'

[git.git] / Documentation / repository-layout.txt

diff --git a/Documentation/repository-layout.txt b/Documentation/repository-layout.txt
index a951b354c4bee8acdba7941df768a0c231b7bde9..4c92e375fed4592f7190086dd40ef6dd1241d238 100644 (file)
--- a/Documentation/repository-layout.txt
+++ b/Documentation/repository-layout.txt
@@ -82,6 +82,15 @@ refs/tags/`name`::
        records any object name (not necessarily a commit
        object, or a tag object that points at a commit object).
 
+refs/remotes/`name`::
+       records tip-of-the-tree commit objects of branches copied
+       from a remote repository.
+
+packed-refs::
+       records the same information as refs/heads/, refs/tags/,
+       and friends record in a more efficient way.  See
+       gitlink:git-pack-refs[1].
+
 HEAD::
        A symref (see glossary) to the `refs/heads/` namespace
        describing the currently active branch.  It does not mean
@@ -124,14 +133,14 @@ info::
        in this directory.
 
 info/refs::
-       This file is to help dumb transports to discover what
-       refs are available in this repository.  Whenever you
-       create/delete a new branch or a new tag, `git
-       update-server-info` should be run to keep this file
-       up-to-date if the repository is published for dumb
-       transports.  The `git-receive-pack` command, which is
-       run on a remote repository when you `git push` into it,
-       runs `hooks/update` hook to help you achieve this.
+       This file helps dumb transports discover what refs are
+       available in this repository.  If the repository is
+       published for dumb transports, this file should be
+       regenerated by `git update-server-info` every time a tag
+       or branch is created or modified.  This is normally done
+       from the `hooks/update` hook, which is run by the
+       `git-receive-pack` command when you `git push` into the
+       repository.
 
 info/grafts::
        This file records fake commit ancestry information, to
@@ -146,8 +155,7 @@ info/exclude::
        exclude pattern list. `.gitignore` is the per-directory
        ignore file.  `git status`, `git add`, `git rm` and `git
        clean` look at it but the core git commands do not look
-       at it.  See also: gitlink:git-ls-files[1] `--exclude-from`
-       and `--exclude-per-directory`.
+       at it.  See also: gitlink:gitignore[5].
 
 remotes::
        Stores shorthands to be used to give URL and default
@@ -169,4 +177,3 @@ shallow::
        This is similar to `info/grafts` but is internally used
        and maintained by shallow clone mechanism.  See `--depth`
        option to gitlink:git-clone[1] and gitlink:git-fetch[1].
-