Merge branch 'maint' to sync with 1.5.6.3

diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index 4795e9875441a498e225b3aec6223ab4a7a597d3..b8e49dce4a19a4d7083459468f27c273c1d91fea 100644 (file)
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -3,16 +3,16 @@ git-upload-pack(1)
 
 NAME
 ----
-git-upload-pack - Send missing objects packed
+git-upload-pack - Send objects packed back to git-fetch-pack
 
 
 SYNOPSIS
 --------
-'git-upload-pack' <directory>
+'git upload-pack' [--strict] [--timeout=<n>] <directory>
 
 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.
@@ -23,6 +23,13 @@ repository.  For push operations, see 'git-send-pack'.
 
 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.
 
@@ -36,4 +43,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite