Merge branch 'jc/diff' into next

diff --git a/Documentation/git-peek-remote.txt b/Documentation/git-peek-remote.txt
index c1527f1bcf1a1ec956176b3b9b2fb3f7b94a2a16..a00060c507516fa7a08eb40c1fde298538d5ef10 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 in a remote repository.
+git-peek-remote - Lists the references in a remote repository
 
 
 SYNOPSIS
@@ -23,7 +22,7 @@ OPTIONS
        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