diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:49 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:49 -0800 |
commit | add0951ab0bee43b5f634d1be68a7a80f627c18f (patch) | |
tree | 084fe451a6b0c7d68d8d16c4ea9f64c38d9e01b0 /Documentation/git-upload-pack.txt | |
parent | 5fc9df08b564aa9d11265ad591f9ef104695ce2b (diff) | |
parent | 0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63 (diff) | |
download | git-add0951ab0bee43b5f634d1be68a7a80f627c18f.tar.gz git-add0951ab0bee43b5f634d1be68a7a80f627c18f.tar.xz |
Merge remote branch 'remotes/trast-doc/for-next'
* remotes/trast-doc/for-next:
Documentation: spell 'git cmd' without dash throughout
Documentation: format full commands in typewriter font
Documentation: warn prominently against merging with dirty trees
Documentation/git-merge: reword references to "remote" and "pull"
Conflicts:
Documentation/config.txt
Documentation/git-config.txt
Documentation/git-merge.txt
Diffstat (limited to 'Documentation/git-upload-pack.txt')
-rw-r--r-- | Documentation/git-upload-pack.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt index b8e49dce4..71ca4ef44 100644 --- a/Documentation/git-upload-pack.txt +++ b/Documentation/git-upload-pack.txt @@ -8,17 +8,17 @@ git-upload-pack - Send objects packed back to git-fetch-pack SYNOPSIS -------- -'git upload-pack' [--strict] [--timeout=<n>] <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 |