git-fetch --upload-pack: disambiguate.

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 438240c0cf3d8df80cd42015c25d4133eb11b017..d1b45f96ed413b57cdb4b86a5bccd56296ff3d05 100644 (file)
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -18,7 +18,7 @@ the objects necessary to complete them.
 
 The ref names and their object names of fetched refs are stored
 in `.git/FETCH_HEAD`.  This information is left for a later merge
-operation done by "git resolve" or "git octopus".
+operation done by "git merge".
 
 
 OPTIONS