Merge branch 'jc/diff' into next

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 438240c0cf3d8df80cd42015c25d4133eb11b017..a67dc340fd63ad389fb961e403781331c2a32cf4 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
@@ -27,7 +27,7 @@ include::fetch-options.txt[]
 
 include::pull-fetch-param.txt[]
 
-
+include::urls.txt[]
 
 SEE ALSO
 --------