Tutorial: adjust merge example to recursive strategy.

diff --git a/Documentation/git-peek-remote.txt b/Documentation/git-peek-remote.txt
index ab783c10662aca8cca02c42886bb881a1264dfb0..915d3f8a06a6577b093acd79d00f93731fc7dec2 100644 (file)
--- a/Documentation/git-peek-remote.txt
+++ b/Documentation/git-peek-remote.txt
@@ -1,10 +1,9 @@
 git-peek-remote(1)
 ==================
-v0.1, July 2005
 
 NAME
 ----
-git-peek-remote - Lists the references on a remote repository.
+git-peek-remote - Lists the references in a remote repository.
 
 
 SYNOPSIS
@@ -20,14 +19,14 @@ OPTIONS
 -------
 --exec=<git-upload-pack>::
        Use this to specify the path to 'git-upload-pack' on the
-       remote side, if is not found on your $PATH.
-       Installations of sshd ignores the user's environment
+       remote side, if it is not found on your $PATH. Some
+       installations of sshd ignores the user's environment
        setup scripts for login shells (e.g. .bash_profile) and
-       your privately installed GIT may not be found on the system
+       your privately installed git may not be found on the system
        default $PATH.  Another workaround suggested is to set
        up your $PATH in ".bashrc", but this flag is for people
        who do not want to pay the overhead for non-interactive
-       shells by having a lean .bashrc file (they set most of
+       shells, but prefer having a lean .bashrc file (they set most of
        the things up in .bash_profile).
 
 <host>::
@@ -49,5 +48,5 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite