Merge branch 'rs/pretty-wrap'

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

diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index 03c52ff526d6e3691b4463047036c0dc2e4849f8..1befca98d49583b42e652b4ce21fccb89b5b5cdb 100644 (file)
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -64,7 +64,7 @@ objects/info/packs::
        are available in this object store.  Whenever a pack is
        added or removed, `git update-server-info` should be run
        to keep this file up-to-date if the repository is
        are available in this object store.  Whenever a pack is
        added or removed, `git update-server-info` should be run
        to keep this file up-to-date if the repository is

-       published for dumb transports.  `git repack` does this
+       published for dumb transports.  'git-repack' does this

        by default.
 
 objects/info/alternates::
        by default.
 
 objects/info/alternates::


@@ -85,7 +85,7 @@ objects/info/http-alternates::
 
 refs::
        References are stored in subdirectories of this
 
 refs::
        References are stored in subdirectories of this

-       directory.  The `git prune` command knows to keep
+       directory.  The 'git-prune' command knows to keep

        objects reachable from refs found in this directory and
        its subdirectories.
 
        objects reachable from refs found in this directory and
        its subdirectories.
 


@@ -125,7 +125,7 @@ details.
 
 branches::
        A slightly deprecated way to store shorthands to be used
 
 branches::
        A slightly deprecated way to store shorthands to be used

-       to specify URL to `git fetch`, `git pull` and `git push`
+       to specify URL to 'git-fetch', 'git-pull' and 'git-push'

        commands is to store a file in `branches/<name>` and
        give 'name' to these commands in place of 'repository'
        argument.
        commands is to store a file in `branches/<name>` and
        give 'name' to these commands in place of 'repository'
        argument.


@@ -133,9 +133,10 @@ branches::
 hooks::
        Hooks are customization scripts used by various git
        commands.  A handful of sample hooks are installed when
 hooks::
        Hooks are customization scripts used by various git
        commands.  A handful of sample hooks are installed when

-       `git init` is run, but all of them are disabled by
-       default.  To enable, they need to be made executable.
-       Read linkgit:githooks[5][hooks] for more details about
+       'git-init' is run, but all of them are disabled by
+       default.  To enable, the `.sample` suffix has to be
+       removed from the filename by renaming.
+       Read linkgit:githooks[5] for more details about

        each hook.
 
 index::
        each hook.
 
 index::


@@ -150,10 +151,10 @@ info/refs::
        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
        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
+       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
        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
+       'git-receive-pack' command when you 'git-push' into the

        repository.
 
 info/grafts::
        repository.
 
 info/grafts::


@@ -167,18 +168,18 @@ info/grafts::
 info/exclude::
        This file, by convention among Porcelains, stores the
        exclude pattern list. `.gitignore` is the per-directory
 info/exclude::
        This file, by convention among Porcelains, stores the
        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
+       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: linkgit:gitignore[5].
 
 remotes::
        Stores shorthands to be used to give URL and default
        at it.  See also: linkgit:gitignore[5].
 
 remotes::
        Stores shorthands to be used to give URL and default

-       refnames to interact with remote repository to `git
-       fetch`, `git pull` and `git push` commands.
+       refnames to interact with remote repository to
+       'git-fetch', 'git-pull' and 'git-push' commands.

 
 logs::
        Records of changes made to refs are stored in this
 
 logs::
        Records of changes made to refs are stored in this

-       directory.  See the documentation on git-update-ref
+       directory.  See linkgit:git-update-ref[1]

        for more information.
 
 logs/refs/heads/`name`::
        for more information.
 
 logs/refs/heads/`name`::