diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-20 15:54:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-20 15:54:57 -0700 |
| commit | ee70fb8e4a66eebb1799e3f28fe31ed8e48c84cf (patch) | |
| tree | 53ba6c864184b98b90a09e18ff618cb497d1c43f | |
| parent | 9fcacaab021ae3835fa21bdf8c1fa9b2ca153a3a (diff) | |
| parent | 2303cad242a6ccc4745d7994ecc0425bd8513a0d (diff) | |
| download | git-ee70fb8e4a66eebb1799e3f28fe31ed8e48c84cf.tar.gz | |
Merge branch 'sn/ls-remote-get-url-doc' into maint
* sn/ls-remote-get-url-doc:
ls-remote: document the '--get-url' option
| -rw-r--r-- | Documentation/git-ls-remote.txt | 5 | ||||
| -rw-r--r-- | builtin/ls-remote.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt index 7a9b86a58a..774de5e9d9 100644 --- a/Documentation/git-ls-remote.txt +++ b/Documentation/git-ls-remote.txt @@ -42,6 +42,11 @@ OPTIONS it successfully talked with the remote repository, whether it found any matching refs. +--get-url:: + Expand the URL of the given remote repository taking into account any + "url.<base>.insteadOf" config setting (See linkgit:git-config[1]) and + exit without talking to the remote. + <repository>:: Location of the repository. The shorthand defined in $GIT_DIR/branches/ can be used. Use "." (dot) to list references in diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c index 41c88a98a2..25e83cfe9d 100644 --- a/builtin/ls-remote.c +++ b/builtin/ls-remote.c @@ -5,7 +5,7 @@ static const char ls_remote_usage[] = "git ls-remote [--heads] [--tags] [-u <exec> | --upload-pack <exec>]\n" -" [-q|--quiet] [--exit-code] [<repository> [<refs>...]]"; +" [-q|--quiet] [--exit-code] [--get-url] [<repository> [<refs>...]]"; /* * Is there one among the list of patterns that match the tail part |