Merge branch 'jk/alt-odb-cleanup'

diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index 0abc806ea9072e563a7bdc1905442180cbc6c27a..822ad593af973dd7a1217cffaef7106876d377c2 100644 (file)
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -9,8 +9,8 @@ git-upload-pack - Send objects packed back to git-fetch-pack
 SYNOPSIS
 --------
 [verse]
-'git-upload-pack' [--strict] [--timeout=<n>] <directory>
-
+'git-upload-pack' [--[no-]strict] [--timeout=<n>] [--stateless-rpc]
+                 [--advertise-refs] <directory>
 DESCRIPTION
 -----------
 Invoked by 'git fetch-pack', learns what
@@ -25,12 +25,22 @@ repository.  For push operations, see 'git send-pack'.
 OPTIONS
 -------
 
---strict::
+--[no-]strict::
        Do not try <directory>/.git/ if <directory> is no Git directory.
 
 --timeout=<n>::
        Interrupt transfer after <n> seconds of inactivity.
 
+--stateless-rpc::
+       Perform only a single read-write cycle with stdin and stdout.
+       This fits with the HTTP POST request processing model where
+       a program may read the request, write a response, and must exit.
+
+--advertise-refs::
+       Only the initial ref advertisement is output, and the program exits
+       immediately. This fits with the HTTP GET request model, where
+       no request content is received but a response must be produced.
+
 <directory>::
        The repository to sync from.