Merge branch 'js/cvsexportcommit'

diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt
index 105d76b0ba85ecc4bd2af6dd560ae28310a5c7be..57598eb0566c8eabc3537fb67b7841c65bcf5c2c 100644 (file)
--- a/Documentation/git-fetch-pack.txt
+++ b/Documentation/git-fetch-pack.txt
@@ -8,11 +8,11 @@ git-fetch-pack - Receive missing objects from another repository
 
 SYNOPSIS
 --------
-'git-fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--upload-pack=<git-upload-pack>] [--depth=<n>] [-v] [<host>:]<directory> [<refs>...]
+'git-fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>...]
 
 DESCRIPTION
 -----------
-Usually you would want to use gitlink:git-fetch[1] which is a
+Usually you would want to use linkgit:git-fetch[1] which is a
 higher level wrapper of this command instead.
 
 Invokes 'git-upload-pack' on a potentially remote repository,
@@ -45,6 +45,12 @@ OPTIONS
        Spend extra cycles to minimize the number of objects to be sent.
        Use it on slower connection.
 
+\--include-tag::
+       If the remote side supports it, annotated tags objects will
+       be downloaded on the same connection as the other objects if
+       the object the tag references is downloaded.  The caller must
+       otherwise determine the tags this option made available.
+
 \--upload-pack=<git-upload-pack>::
        Use this to specify the path to 'git-upload-pack' on the
        remote side, if is not found on your $PATH.
@@ -63,6 +69,9 @@ OPTIONS
 \--depth=<n>::
        Limit fetching to ancestor-chains not longer than n.
 
+\--no-progress::
+       Do not show the progress.
+
 \-v::
        Run verbosely.
 
@@ -90,4 +99,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite