X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-fetch.txt;h=d1b45f96ed413b57cdb4b86a5bccd56296ff3d05;hb=87e80c4b5fec421ecd566498b7dd4672f76fdca2;hp=438240c0cf3d8df80cd42015c25d4133eb11b017;hpb=8fc66df237afce0b4318657f166b3583831949f3;p=git.git

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 438240c0..d1b45f96 100644
--- 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