Merge branch 'nd/ls-remote-does-not-have-u-option'

* nd/ls-remote-does-not-have-u-option:
  ls-remote.txt: delete unsupported option
This commit is contained in:
Junio C Hamano 2015-10-14 14:30:19 -07:00
commit c35acb632c
2 changed files with 2 additions and 3 deletions

View File

@ -9,7 +9,7 @@ git-ls-remote - List references in a remote repository
SYNOPSIS SYNOPSIS
-------- --------
[verse] [verse]
'git ls-remote' [--heads] [--tags] [-u <exec> | --upload-pack <exec>] 'git ls-remote' [--heads] [--tags] [--upload-pack=<exec>]
[--exit-code] <repository> [<refs>...] [--exit-code] <repository> [<refs>...]
DESCRIPTION DESCRIPTION
@ -29,7 +29,6 @@ OPTIONS
both, references stored in refs/heads and refs/tags are both, references stored in refs/heads and refs/tags are
displayed. displayed.
-u <exec>::
--upload-pack=<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 host. This allows listing references from repositories accessed via

View File

@ -4,7 +4,7 @@
#include "remote.h" #include "remote.h"
static const char ls_remote_usage[] = static const char ls_remote_usage[] =
"git ls-remote [--heads] [--tags] [-u <exec> | --upload-pack <exec>]\n" "git ls-remote [--heads] [--tags] [--upload-pack=<exec>]\n"
" [-q | --quiet] [--exit-code] [--get-url] [<repository> [<refs>...]]"; " [-q | --quiet] [--exit-code] [--get-url] [<repository> [<refs>...]]";
/* /*