git-merge: make it usable as the first class UI

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index a90521e5139b264d1a37289966da64ea53c862cd..86060472ad88088bcb59df5eb9acce097f68cb83 100644 (file)
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -62,7 +62,7 @@ OPTIONS
 --quiet::
 -q::
        Operate quietly.  This flag is passed to "rsync" and
-       "git-clone-pack" commands when given.
+       "git-fetch-pack" commands when given.
 
 -n::
        No checkout of HEAD is performed after the clone is complete.
@@ -75,6 +75,7 @@ OPTIONS
        this option is used, neither the `origin` branch nor the
        default `remotes/origin` file is created.
 
+--origin <name>::
 -o <name>::
        Instead of using the branch name 'origin' to keep track
        of the upstream repository, use <name> instead.  Note
@@ -85,7 +86,7 @@ OPTIONS
 --upload-pack <upload-pack>::
 -u <upload-pack>::
        When given, and the repository to clone from is handled
-       by 'git-clone-pack', '--exec=<upload-pack>' is passed to
+       by 'git-fetch-pack', '--exec=<upload-pack>' is passed to
        the command to specify non-default path for the command
        run on the other end.