X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fpull-fetch-param.txt;h=b5b979242ca809d121ef10826ab083159ea2195c;hb=31ec6abf887ec95642cbe82fe61076e975494ab0;hp=a7628aa34b78a1c02445327449084d68278bf96a;hpb=8fc66df237afce0b4318657f166b3583831949f3;p=git.git diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index a7628aa3..b5b97924 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -9,15 +9,16 @@ - 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/ - ssh://host.xz/path/to/repo.git/ - ssh://host.xz/~user/path/to/repo.git/ - ssh://host.xz/~/path/to/repo.git =============================================================== + - SSH Is the default transport protocol and also supports an - scp-like syntax. Both syntaxes support username expansion. - The following three are identical to the last three above, - respectively: +SSH Is the default transport protocol and also supports an +scp-like syntax. Both syntaxes support username expansion, +as does the native git protocol. The following three are +identical to the last three above, respectively: + =============================================================== - host.xz:/path/to/repo.git/ @@ -25,8 +26,8 @@ - host.xz:path/to/repo.git =============================================================== + - To sync with a local directory, use: - +To sync with a local directory, use: ++ =============================================================== - /path/to/repo.git/ =============================================================== @@ -112,7 +113,7 @@ on the remote branch, merge it into your development branch with `git pull . remote-B`, while you are on `my-B` branch. The common `Pull: master:origin` mapping of a remote `master` branch to a local `origin` branch, which is then merged to a -ocal development branch, again typically named `master`, is made +local development branch, again typically named `master`, is made when you run `git clone` for you to follow this pattern. + [NOTE]