From 83a5ad61268bbfea7e0d3180528366690f951554 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Tue, 20 Feb 2007 03:01:44 +0100
Subject: fetch & clone: do not output progress when not on a tty

This adds the option "--no-progress" to fetch-pack and upload-pack,
and makes fetch and clone pass this option when stdout is not a tty.

While at documenting that option, also document --strict and --timeout
options for upload-pack.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 Documentation/git-upload-pack.txt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'Documentation/git-upload-pack.txt')

diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index 9da062d5c9..c75c86ea79 100644
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -8,7 +8,7 @@ git-upload-pack - Send objects packed back to git-fetch-pack
 
 SYNOPSIS
 --------
-'git-upload-pack' <directory>
+'git-upload-pack' [--strict] [--timeout=<n>] [--no-progress] <directory>
 
 DESCRIPTION
 -----------
@@ -23,6 +23,16 @@ 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.
+
+\--no-progress::
+	Do not show the progress.
+
 <directory>::
 	The repository to sync from.
 
-- 
cgit v1.2.3