aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorAndrew Ruder <andy@aeruder.net>2007-07-04 17:21:36 -0500
committerJunio C Hamano <gitster@pobox.com>2007-07-05 21:43:48 -0700
commit37ba05619c76f9dbde35c418c6fc8af7bcda24c8 (patch)
treeb6c3f07f6d9bf3be5dee0ff6d0c0a6bedfaa954a /Documentation/git-pull.txt
parent114fd812f78ea375ee6782d4ff0203f3ae20b076 (diff)
downloadgit-37ba05619c76f9dbde35c418c6fc8af7bcda24c8.tar.gz
git-37ba05619c76f9dbde35c418c6fc8af7bcda24c8.tar.xz
Add urls.txt to git-clone man page
Since git-clone is one of the many commands taking URLs to remote repositories as an argument, it should include the URL-types list from urls.txt. Split up urls.txt into urls.txt and urls-remotes.txt. The latter should be used by anything besides git-clone where a discussion of using .git/config and .git/remotes/ to name URLs just doesn't make as much sense. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
-rw-r--r--Documentation/git-pull.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 84693f8b1..e1eb2c1d0 100644
--- 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[]