Merge branch 'jc/maint-reset'

diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index b2c9307661ebff26269cf3802a06490e0f1ba165..bac465e13f2b2d0aaadaedf00fd03ab6f3f9a62c 100644 (file)
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -3,12 +3,12 @@ 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
 -----------
@@ -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