X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Documentation%2Fgitprotocol-http.txt;h=836b3490ccda97f6fb8356b25244365198a8f681;hb=efbae0583bb8556444c57d4c336101f97efa6d66;hp=7533f0e61b719fce71e8498a096363692874ed96;hpb=62b4f7b9c6a767cfa9eb3efa96e65305f98386be;p=thirdparty%2Fgit.git diff --git a/Documentation/gitprotocol-http.txt b/Documentation/gitprotocol-http.txt index 7533f0e61b..836b3490cc 100644 --- a/Documentation/gitprotocol-http.txt +++ b/Documentation/gitprotocol-http.txt @@ -42,7 +42,7 @@ both the "smart" and "dumb" HTTP protocols used by Git operate by appending additional path components onto the end of the user supplied `$GIT_URL` string. -An example of a dumb client requesting for a loose object: +An example of a dumb client requesting a loose object: $GIT_URL: http://example.com:8080/git/repo.git URL request: http://example.com:8080/git/repo.git/objects/d0/49f6c27a2244e12041955e262a404c7faba355 @@ -379,7 +379,7 @@ C: Place any object seen into set `advertised`. C: Build an empty set, `common`, to hold the objects that are later determined to be on both ends. -C: Build a set, `want`, of the objects from `advertised` the client +C: Build a set, `want`, of the objects from `advertised` that the client wants to fetch, based on what it saw during ref discovery. C: Start a queue, `c_pending`, ordered by commit time (popping newest @@ -423,7 +423,7 @@ multiple commands. Object names MUST be given using the object format negotiated through the `object-format` capability (default SHA-1). The `have` list is created by popping the first 32 commits -from `c_pending`. Less can be supplied if `c_pending` empties. +from `c_pending`. Fewer can be supplied if `c_pending` empties. If the client has sent 256 "have" commits and has not yet received one of those back from `s_common`, or the client has