Merge branch 'nd/grep-assume-unchanged' into maint

diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index c267cdae4a5ec68ff8476f3a7d16fd8bf6306887..abe7bf9ff9eb9a3ddb1924938de071291520797a 100644 (file)
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -31,7 +31,7 @@ OPTIONS
 
 -u <exec>::
 --upload-pack=<exec>::
-       Specify the full path of `git-upload-pack` on the remote
+       Specify the full path of 'git-upload-pack' on the remote
        host. This allows listing references from repositories accessed via
        SSH and where the SSH daemon does not use the PATH configured by the
        user.
@@ -69,7 +69,7 @@ EXAMPLES
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 GIT
 ---