diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-14 14:30:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-14 14:30:19 -0700 |
| commit | c35acb632c70ef0fdc8b741350094907f1938e88 (patch) | |
| tree | 1c254b6c25856d174faa7eb7a7a543212382f7b0 | |
| parent | 8e2b4b29420d8a554c4c4f8166e77c43c11c0372 (diff) | |
| parent | 29bc480aa1a33ace2866743fed2bf8aba5de4d91 (diff) | |
Merge branch 'nd/ls-remote-does-not-have-u-option'
* nd/ls-remote-does-not-have-u-option:
ls-remote.txt: delete unsupported option
| -rw-r--r-- | Documentation/git-ls-remote.txt | 3 | ||||
| -rw-r--r-- | builtin/ls-remote.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt index 2e22915eb8..d510c05e11 100644 --- 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] [--upload-pack=<exec>] [--exit-code] <repository> [<refs>...] DESCRIPTION @@ -29,7 +29,6 @@ OPTIONS both, references stored in refs/heads and refs/tags are displayed. --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 diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c index 4554dbc8a9..5e9d5450b7 100644 --- a/builtin/ls-remote.c +++ b/builtin/ls-remote.c @@ -4,7 +4,7 @@ #include "remote.h" 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>...]]"; /* |