Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/upload-pack'
[gitweb.git]
/
Documentation
/
git-pull.txt
diff --git
a/Documentation/git-pull.txt
b/Documentation/git-pull.txt
index 94478ed94d70c597c8a024afe79b456a66d40a35..e1eb2c1d0037f06dbf2b5cc0bde84918157ee2bf 100644
(file)
--- a/
Documentation/git-pull.txt
+++ b/
Documentation/git-pull.txt
@@
-29,7
+29,7
@@
include::fetch-options.txt[]
include::pull-fetch-param.txt[]
-include::urls.txt[]
+include::urls
-remotes
.txt[]
include::merge-strategies.txt[]
@@
-165,4
+165,3
@@
Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the gitlink:git[7] suite
-