Merge branch 'cc/help'

diff --git a/Documentation/git-peek-remote.txt b/Documentation/git-peek-remote.txt
index abc171266a35299159308d0653bb0c659b8bdc77..0001710072c5f0f708323d99e1bb632d7911c842 100644 (file)
--- a/Documentation/git-peek-remote.txt
+++ b/Documentation/git-peek-remote.txt
@@ -12,8 +12,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-Lists the references the remote repository has, and optionally
-stores them in the local repository under the same name.
+This command is deprecated; use `git-ls-remote` instead.
 
 OPTIONS
 -------
@@ -29,9 +28,6 @@ OPTIONS
        shells, but prefer having a lean .bashrc file (they set most of
        the things up in .bash_profile).
 
-\--exec=<git-upload-pack>::
-       Same \--upload-pack=<git-upload-pack>.
-
 <host>::
        A remote host that houses the repository.  When this
        part is specified, 'git-upload-pack' is invoked via
@@ -51,4 +47,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite