Merge branch 'jc/maint-add-u-remove-conflicted'

diff --git a/Documentation/git-init-db.txt b/Documentation/git-init-db.txt
index 5412135d763af3a8c68e18441b774654f07eadfd..1fd0ff2610a1375bcf0defe2a234b2dee1a7997a 100644 (file)
--- a/Documentation/git-init-db.txt
+++ b/Documentation/git-init-db.txt
@@ -8,12 +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.
-