Add -y/--no-prompt option to mergetool

diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index 93e9a60330797070fc50c0df6c0767b7b81f79c0..abe7bf9ff9eb9a3ddb1924938de071291520797a 100644 (file)
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -9,7 +9,7 @@ git-ls-remote - List references in a remote repository
 SYNOPSIS
 --------
 [verse]
-'git-ls-remote' [--heads] [--tags]  [-u <exec> | --upload-pack <exec>]
+'git ls-remote' [--heads] [--tags]  [-u <exec> | --upload-pack <exec>]
              <repository> <refs>...
 
 DESCRIPTION
@@ -20,17 +20,21 @@ commit IDs.
 
 OPTIONS
 -------
--h|--heads, -t|--tags::
+-h::
+--heads::
+-t::
+--tags::
        Limit to only refs/heads and refs/tags, respectively.
        These options are _not_ mutually exclusive; when given
        both, references stored in refs/heads and refs/tags are
        displayed.
 
--u <exec>, --upload-pack=<exec>::
-       Specify the full path of gitlink:git-upload-pack[1] on the remote
+-u <exec>::
+--upload-pack=<exec>::
+       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. Also see the '--exec' option for gitlink:git-peek-remote[1].
+       user.
 
 <repository>::
        Location of the repository.  The shorthand defined in
@@ -65,8 +69,8 @@ EXAMPLES
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite