summaryrefslogtreecommitdiffstats
path: root/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-02-07 08:04:39 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-02-07 08:04:39 +0000
commit40f2f8dd79c1622a7986e2ff2faa15c72860c79f (patch)
tree8caad58489c0d80a936d8185c85f45f19cf0703e /git-pull.txt
parent5e461f9764f680aa78a7c16f1c9182dc36961662 (diff)
downloadgit-htmldocs-40f2f8dd79c1622a7986e2ff2faa15c72860c79f.tar.gz
Autogenerated HTML docs for v1.1.6-g5a79
Diffstat (limited to 'git-pull.txt')
-rw-r--r--git-pull.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-pull.txt b/git-pull.txt
index 3a7d38522..20175f4b9 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
--------