summaryrefslogtreecommitdiff
path: root/Documentation/git-upload-pack.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-upload-pack.txt')
-rw-r--r--Documentation/git-upload-pack.txt17
1 files changed, 12 insertions, 5 deletions
diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index 9da062d5c9..71ca4ef442 100644
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -8,21 +8,28 @@ 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-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.
-The UI for the protocol is on the 'git-fetch-pack' side, and the
+The UI for the protocol is on the 'git fetch-pack' side, and the
program pair is meant to be used to pull updates from a remote
-repository. For push operations, see 'git-send-pack'.
+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