Merge branch 'mh/fix-send-email-threaded'

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 26fd1b111798461b9150f1416721aa460f1ea525..b14de6c407b8bd0bc001c608ca4f26fc619abf3e 100644 (file)
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git clone' [--template=<template_directory>]
-         [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare]
+         [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
          [-o <name>] [-u <upload-pack>] [--reference <repository>]
          [--depth <depth>] [--] <repository> [<directory>]
 
@@ -90,6 +90,11 @@ then the cloned repository will become corrupt.
        Operate quietly.  This flag is also passed to the `rsync'
        command when given.
 
+--verbose::
+-v::
+       Display the progressbar, even in case the standard output is not
+       a terminal.
+
 --no-checkout::
 -n::
        No checkout of HEAD is performed after the clone is complete.
@@ -106,10 +111,13 @@ then the cloned repository will become corrupt.
        used, neither remote-tracking branches nor the related
        configuration variables are created.
 
+--mirror::
+       Set up a mirror of the remote repository.  This implies --bare.
+
 --origin <name>::
 -o <name>::
        Instead of using the remote name 'origin' to keep track
-       of the upstream repository, use <name> instead.
+       of the upstream repository, use <name>.
 
 --upload-pack <upload-pack>::
 -u <upload-pack>::
@@ -141,7 +149,7 @@ then the cloned repository will become corrupt.
        part of the source repository is used if no directory is
        explicitly given ("repo" for "/path/to/repo.git" and "foo"
        for "host.xz:foo/.git").  Cloning into an existing directory
-       is not allowed.
+       is only allowed if the directory is empty.
 
 :git-clone: 1
 include::urls.txt[]