diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-04 13:07:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-04 13:07:09 -0800 |
| commit | de8139005f04a4a5ad8a54c771475803594028cd (patch) | |
| tree | b8ca6c2c2c591bdd8d99ffe62797e80ff8ff8008 /Documentation | |
| parent | d3f552b67413ab06ea456d1cc7c57c5661bbf468 (diff) | |
| parent | f26b5dc9efccc998510505685d6d919b4dd087e7 (diff) | |
| download | git-de8139005f04a4a5ad8a54c771475803594028cd.tar.gz git-de8139005f04a4a5ad8a54c771475803594028cd.tar.xz | |
Merge branch 'maint'
* maint:
urls.txt: document optional port specification in git URLS
builtin-mv.c: check for unversionned files before looking at the destination.
Add a testcase for "git mv -f" on untracked files.
Missing && in t/t7001.sh.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/urls.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/urls.txt b/Documentation/urls.txt index fa34c6747..5355ebc0f 100644 --- a/Documentation/urls.txt +++ b/Documentation/urls.txt @@ -6,10 +6,10 @@ to name the remote repository: =============================================================== - rsync://host.xz/path/to/repo.git/ -- http://host.xz/path/to/repo.git/ -- https://host.xz/path/to/repo.git/ -- git://host.xz/path/to/repo.git/ -- git://host.xz/~user/path/to/repo.git/ +- http://host.xz{startsb}:port{endsb}/path/to/repo.git/ +- https://host.xz{startsb}:port{endsb}/path/to/repo.git/ +- git://host.xz{startsb}:port{endsb}/path/to/repo.git/ +- git://host.xz{startsb}:port{endsb}/~user/path/to/repo.git/ - ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/ - ssh://{startsb}user@{endsb}host.xz/path/to/repo.git/ - ssh://{startsb}user@{endsb}host.xz/~user/path/to/repo.git/ |