Merge branch 'master' into cc/trace

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 3a7d385225754d5c865ac333a5a65e71c4e7fb65..51577fcbe638981baf1870006eef633be304e26b 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -3,7 +3,7 @@ git-pull(1)
 
 NAME
 ----
-git-pull - Pull and merge from another repository.
+git-pull - Pull and merge from another repository
 
 
 SYNOPSIS
@@ -29,8 +29,9 @@ include::fetch-options.txt[]
 
 include::pull-fetch-param.txt[]
 
-include::merge-strategies.txt[]
+include::urls.txt[]
 
+include::merge-strategies.txt[]
 
 EXAMPLES
 --------