Merge branch 'sp/maint-fd-limit' into maint

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index ab7293351d283e7ee3a8275c534c3667d6b4d696..42e7021215563f146a66d14e1b642d4dbe55bfaf 100644 (file)
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -12,7 +12,8 @@ SYNOPSIS
 'git clone' [--template=<template_directory>]
          [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
          [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
-         [--depth <depth>] [--recursive] [--] <repository> [<directory>]
+         [--depth <depth>] [--recursive|--recurse-submodules] [--] <repository>
+         [<directory>]
 
 DESCRIPTION
 -----------
@@ -131,7 +132,7 @@ objects from the source repository into a pack in the cloned repository.
        Set up a mirror of the source repository.  This implies `--bare`.
        Compared to `--bare`, `--mirror` not only maps local branches of the
        source to local branches of the target, it maps all refs (including
-       remote branches, notes etc.) and sets up a refspec configuration such
+       remote-tracking branches, notes etc.) and sets up a refspec configuration such
        that all these refs are overwritten by a `git remote update` in the
        target repository.
 
@@ -167,6 +168,7 @@ objects from the source repository into a pack in the cloned repository.
        as patches.
 
 --recursive::
+--recurse-submodules::
        After the clone is created, initialize all submodules within,
        using their default settings. This is equivalent to running
        `git submodule update --init --recursive` immediately after