Allow the user to control the verbosity of merge-recursive.

diff --git a/Documentation/repository-layout.txt b/Documentation/repository-layout.txt
index e20fb7e74c22390e810a392f2625a3ba6b325477..0fdd36614d8db6f52d1bdc6f8bf2e5a667edeff0 100644 (file)
--- a/Documentation/repository-layout.txt
+++ b/Documentation/repository-layout.txt
@@ -102,7 +102,7 @@ branches::
 hooks::
        Hooks are customization scripts used by various git
        commands.  A handful of sample hooks are installed when
-       `git init-db` is run, but all of them are disabled by
+       `git init` is run, but all of them are disabled by
        default.  To enable, they need to be made executable.
        Read link:hooks.html[hooks] for more details about
        each hook.