diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-09-06 11:06:32 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-09-06 11:10:41 -0700 |
commit | 5a277f3ff7cb57e35ce574e93866b6c7e3bf8971 (patch) | |
tree | e93c73328b69b31ef426b1985c0ab825376141ca /Documentation | |
parent | Documentation: clarify effects of -- <path> arguments (diff) | |
download | tgif-5a277f3ff7cb57e35ce574e93866b6c7e3bf8971.tar.xz |
Revert "Merge branch 'cb/maint-quiet-push' into maint"
This reverts commit ffa69e61d3c5730bd4b65a465efc130b0ef3c7df, reversing
changes made to 4a13c4d14841343d7caad6ed41a152fee550261d.
Adding a new command line option to receive-pack and feed it from
send-pack is not an acceptable way to add features, as there is no
guarantee that your updated send-pack will be talking to updated
receive-pack. New features need to be added via the capability mechanism
negotiated over the protocol.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-receive-pack.txt | 5 | ||||
-rw-r--r-- | Documentation/git-send-pack.txt | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt index d7b68afbc2..459c08598f 100644 --- a/Documentation/git-receive-pack.txt +++ b/Documentation/git-receive-pack.txt @@ -9,7 +9,7 @@ git-receive-pack - Receive what is pushed into the repository SYNOPSIS -------- [verse] -'git-receive-pack' [--quiet] <directory> +'git-receive-pack' <directory> DESCRIPTION ----------- @@ -35,9 +35,6 @@ are not fast-forwards. OPTIONS ------- ---quiet:: - Print only error messages. - <directory>:: The repository to sync into. diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt index bed9e1f097..bd3eaa69bf 100644 --- a/Documentation/git-send-pack.txt +++ b/Documentation/git-send-pack.txt @@ -9,7 +9,7 @@ git-send-pack - Push objects over git protocol to another repository SYNOPSIS -------- [verse] -'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--quiet] [--verbose] [--thin] [<host>:]<directory> [<ref>...] +'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...] DESCRIPTION ----------- @@ -45,9 +45,6 @@ OPTIONS the remote repository can lose commits; use it with care. ---quiet:: - Print only error messages. - --verbose:: Run verbosely. |