Merge 1.5.5.4 in

diff --git a/Documentation/git-init-db.txt b/Documentation/git-init-db.txt
index ab0201aec2131d48b535cf6307fc446dffd89a9b..439cabb737a48e009ea0a3a4e5bb323c1b2ccca9 100644 (file)
--- a/Documentation/git-init-db.txt
+++ b/Documentation/git-init-db.txt
@@ -8,11 +8,11 @@ git-init-db - Creates an empty git repository
 
 SYNOPSIS
 --------
-'git-init-db' [--template=<template_directory>] [--shared[=<permissions>]]
+'git-init-db' [-q | --quiet] [--template=<template_directory>] [--shared[=<permissions>]]
 
 
 DESCRIPTION
 -----------
 
-This is a synonym for gitlink:git-init[1].  Please refer to the
+This is a synonym for linkgit:git-init[1].  Please refer to the
 documentation of that command.