X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-pull.txt;h=20175f4b9a71c0299c57aab9f6c4452fb05cc53f;hb=0a48a344c6a886fee7f4e6d88e8ac5d5317ad8eb;hp=3a7d385225754d5c865ac333a5a65e71c4e7fb65;hpb=c2f3bf071ee90b01f2d629921bb04c4f798f02fa;p=git.git diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 3a7d3852..20175f4b 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -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 --------