Merge branch 'jc/maint-reset'

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 23418816146d0b65eeabdd7a3d67dcd7e8c760e1..7973e6af4c2aa31ea9ae9b91b4c4cd5ee2256762 100644 (file)
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -62,12 +62,16 @@ OPTIONS
        .git/objects/info/alternates to share the objects
        with the source repository.  The resulting repository
        starts out without any object of its own.
-       *NOTE*: this is a possibly dangerous operation; do *not* use
-       it unless you understand what it does. If you clone your
-       repository using this option, then delete branches in the
-       source repository and then run linkgit:git-gc[1] using the
-       '--prune' option in the source repository, it may remove
-       objects which are referenced by the cloned repository.
++
+*NOTE*: this is a possibly dangerous operation; do *not* use
+it unless you understand what it does. If you clone your
+repository using this option and then delete branches (or use any
+other git command that makes any existing commit unreferenced) in the
+source repository, some objects may become unreferenced (or dangling).
+These objects may be removed by normal git operations (such as git-commit[1])
+which automatically call git-gc[1]. If these objects are removed and
+were referenced by the cloned repository, then the cloned repository
+will become corrupt.
 
 
 
@@ -78,6 +82,8 @@ OPTIONS
        an already existing repository as an alternate will
        require fewer objects to be copied from the repository
        being cloned, reducing network and local storage costs.
++
+*NOTE*: see NOTE to --shared option.
 
 --quiet::
 -q::
@@ -199,4 +205,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite