Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'lt/rev-list' into next
[gitweb.git]
/
Documentation
/
git-pull.txt
diff --git
a/Documentation/git-pull.txt
b/Documentation/git-pull.txt
index 3a7d385225754d5c865ac333a5a65e71c4e7fb65..20175f4b9a71c0299c57aab9f6c4452fb05cc53f 100644
(file)
--- 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-strategie
s.txt[]
+include::
url
s.txt[]
+include::merge-strategies.txt[]
EXAMPLES
--------