X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull.txt;h=20175f4b9a71c0299c57aab9f6c4452fb05cc53f;hb=c915412d65374e88aa1e6de642bb0e0616d387e3;hp=3a7d385225754d5c865ac333a5a65e71c4e7fb65;hpb=1a4e841b439ba014b365999c3a6b9e2be3740bd8;p=git.git diff --git a/git-pull.txt b/git-pull.txt index 3a7d3852..20175f4b 100644 --- a/git-pull.txt +++ b/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 --------