Merge branch 'js/wrap-log'

[git.git] / Documentation / git-upload-pack.txt

diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index 3d8f8ef6670e84b5601fdcd3e74717a4f3a0fde4..fd6519299a9a089a1ffec544f55ba40775aedf9b 100644 (file)
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -3,16 +3,16 @@ git-upload-pack(1)
 
 NAME
 ----
 
 NAME
 ----

-git-upload-pack - Send missing objects packed.
+git-upload-pack - Send objects packed back to git-fetch-pack

 
 
 SYNOPSIS
 --------
 
 
 SYNOPSIS
 --------

-'git-upload-pack' <directory>
+'git-upload-pack' [--strict] [--timeout=<n>] <directory>

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------

-Invoked by 'git-clone-pack' and/or 'git-fetch-pack', learns what
+Invoked by 'git-fetch-pack', learns what

 objects the other side is missing, and sends them after packing.
 
 This command is usually not invoked directly by the end user.
 objects the other side is missing, and sends them after packing.
 
 This command is usually not invoked directly by the end user.


@@ -23,6 +23,13 @@ repository.  For push operations, see 'git-send-pack'.
 
 OPTIONS
 -------
 
 OPTIONS
 -------

+
+\--strict::
+       Do not try <directory>/.git/ if <directory> is no git directory.
+
+\--timeout=<n>::
+       Interrupt transfer after <n> seconds of inactivity.
+

 <directory>::
        The repository to sync from.
 
 <directory>::
        The repository to sync from.