diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 08:38:15 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 08:38:15 +0300 |
| commit | 41267e96972d5a158298f777caecd7433a1b1a94 (patch) | |
| tree | c2203a195e741d750bfb5d65057f1fe06d140b00 /Documentation | |
| parent | 30b015bffe21a127d4f349f9e876562c3c94a1a2 (diff) | |
| parent | 5e3548ef161d4d284e35cf5f5d6a181ba4fe707b (diff) | |
Merge branch 'bw/server-options'
The transport protocol v2 is getting updated further.
* bw/server-options:
fetch: send server options when using protocol v2
ls-remote: send server options when using protocol v2
serve: introduce the server-option capability
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/fetch-options.txt | 8 | ||||
| -rw-r--r-- | Documentation/git-ls-remote.txt | 8 | ||||
| -rw-r--r-- | Documentation/technical/protocol-v2.txt | 10 |
3 files changed, 26 insertions, 0 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 8631e365f4..97d3217df9 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -188,6 +188,14 @@ endif::git-pull[] is specified. This flag forces progress status even if the standard error stream is not directed to a terminal. +-o <option>:: +--server-option=<option>:: + Transmit the given string to the server when communicating using + protocol version 2. The given string must not contain a NUL or LF + character. + When multiple `--server-option=<option>` are given, they are all + sent to the other side in the order listed on the command line. + -4:: --ipv4:: Use IPv4 addresses only, ignoring IPv6 addresses. diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt index 6ad1e34afc..b9fd3770a6 100644 --- a/Documentation/git-ls-remote.txt +++ b/Documentation/git-ls-remote.txt @@ -70,6 +70,14 @@ OPTIONS themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error. +-o <option>:: +--server-option=<option>:: + Transmit the given string to the server when communicating using + protocol version 2. The given string must not contain a NUL or LF + character. + When multiple `--server-option=<option>` are given, they are all + sent to the other side in the order listed on the command line. + <repository>:: The "remote" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and diff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt index 136179d7d8..d7b6f38e0a 100644 --- a/Documentation/technical/protocol-v2.txt +++ b/Documentation/technical/protocol-v2.txt @@ -393,3 +393,13 @@ header. 1 - pack data 2 - progress messages 3 - fatal error message just before stream aborts + + server-option +~~~~~~~~~~~~~~~ + +If advertised, indicates that any number of server specific options can be +included in a request. This is done by sending each option as a +"server-option=<option>" capability line in the capability-list section of +a request. + +The provided options must not contain a NUL or LF character. |