Merge branch 'da/araxis-mergetool'

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 0e14e732fd470b7f48882c9959235785df19b7b0..b14de6c407b8bd0bc001c608ca4f26fc619abf3e 100644 (file)
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -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.
@@ -112,7 +117,7 @@ then the cloned repository will become corrupt.
 --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>::
@@ -144,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[]