Merge branch 'master' into cc/trace

diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index 4795e9875441a498e225b3aec6223ab4a7a597d3..b2c9307661ebff26269cf3802a06490e0f1ba165 100644 (file)
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-Invoked by 'git-clone-pack' and/or '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.