Docs: move git url and remotes text to separate sections

The sections on git urls and remotes files in the git-fetch,
git-pull, and git-push manpages seem long enough to be worth a
manpage section of their own.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index d1b45f96ed413b57cdb4b86a5bccd56296ff3d05..a67dc340fd63ad389fb961e403781331c2a32cf4 100644 (file)
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -27,7 +27,7 @@ include::fetch-options.txt[]
 
 include::pull-fetch-param.txt[]
 
 
 include::pull-fetch-param.txt[]
 

-
+include::urls.txt[]

 
 SEE ALSO
 --------
 
 SEE ALSO
 --------

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::pull-fetch-param.txt[]
 

-include::merge-strategies.txt[]
+include::urls.txt[]

 
 

+include::merge-strategies.txt[]

 
 EXAMPLES
 --------
 
 EXAMPLES
 --------

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 7e9452efe1f82a34fb5d2e5eff847bd93a1260f6..ce909f584b855f6aa1b3b830c99a900c1258a7fb 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -24,8 +24,8 @@ documentation for gitlink:git-receive-pack[1].
 OPTIONS
 -------
 <repository>::
 OPTIONS
 -------
 <repository>::

-       The "remote" repository that is destination of a push operation.
-include::urls.txt[]
+       The "remote" repository that is destination of a push
+       operation.  See the section <<URLS,GIT URLS>> below.

 
 <refspec>::
        The canonical format of a <refspec> parameter is
 
 <refspec>::
        The canonical format of a <refspec> parameter is


@@ -65,6 +65,7 @@ Some short-cut notations are also supported.
        This flag disables the check.  This can cause the
        remote repository to lose commits; use it with care.
 
        This flag disables the check.  This can cause the
        remote repository to lose commits; use it with care.
 

+include::urls.txt[]

 
 Author
 ------
 
 Author
 ------

diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index 9011ffbea3107d082871cc73a5480b6b089299f5..e852f41a322933aa010bdf79247508e42ee3f661 100644 (file)
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -1,7 +1,6 @@
 <repository>::
        The "remote" repository that is the source of a fetch
 <repository>::
        The "remote" repository that is the source of a fetch

-       or pull operation.
-include::urls.txt[]
+       or pull operation.  See the section <<URLS,GIT URLS>> below.

 
 <refspec>::
        The canonical format of a <refspec> parameter is
 
 <refspec>::
        The canonical format of a <refspec> parameter is

diff --git a/Documentation/urls.txt b/Documentation/urls.txt
index e027c71e07de22273bf74910615b843e93417896..74774134e3939cf1f5447d3aaec319994504ce1b 100644 (file)
--- a/Documentation/urls.txt
+++ b/Documentation/urls.txt
@@ -1,6 +1,9 @@
+GIT URLS[[URLS]]
+----------------
+

 One of the following notations can be used
 to name the remote repository:
 One of the following notations can be used
 to name the remote repository:

-+
+

 ===============================================================
 - rsync://host.xz/path/to/repo.git/
 - http://host.xz/path/to/repo.git/
 ===============================================================
 - rsync://host.xz/path/to/repo.git/
 - http://host.xz/path/to/repo.git/


@@ -11,39 +14,42 @@ to name the remote repository:
 - ssh://host.xz/~user/path/to/repo.git/
 - ssh://host.xz/~/path/to/repo.git
 ===============================================================
 - ssh://host.xz/~user/path/to/repo.git/
 - ssh://host.xz/~/path/to/repo.git
 ===============================================================

-+
+

 SSH Is the default transport protocol and also supports an
 scp-like syntax.  Both syntaxes support username expansion,
 as does the native git protocol. The following three are
 identical to the last three above, respectively:
 SSH Is the default transport protocol and also supports an
 scp-like syntax.  Both syntaxes support username expansion,
 as does the native git protocol. The following three are
 identical to the last three above, respectively:

-+
+

 ===============================================================
 - host.xz:/path/to/repo.git/
 - host.xz:~user/path/to/repo.git/
 - host.xz:path/to/repo.git
 ===============================================================
 ===============================================================
 - host.xz:/path/to/repo.git/
 - host.xz:~user/path/to/repo.git/
 - host.xz:path/to/repo.git
 ===============================================================

-+
+

 To sync with a local directory, use:
 To sync with a local directory, use:

-+
+

 ===============================================================
 - /path/to/repo.git/
 ===============================================================
 ===============================================================
 - /path/to/repo.git/
 ===============================================================

-+
+
+REMOTES
+-------
+

 In addition to the above, as a short-hand, the name of a
 file in `$GIT_DIR/remotes` directory can be given; the
 named file should be in the following format:
 In addition to the above, as a short-hand, the name of a
 file in `$GIT_DIR/remotes` directory can be given; the
 named file should be in the following format:

-+
+

        URL: one of the above URL format
        Push: <refspec>
        Pull: <refspec>
        URL: one of the above URL format
        Push: <refspec>
        Pull: <refspec>

-+
-When such a short-hand is specified in place of
+
+Then such a short-hand is specified in place of

 <repository> without <refspec> parameters on the command
 line, <refspec> specified on `Push:` lines or `Pull:`
 lines are used for `git-push` and `git-fetch`/`git-pull`,
 respectively.  Multiple `Push:` and and `Pull:` lines may
 be specified for additional branch mappings.
 <repository> without <refspec> parameters on the command
 line, <refspec> specified on `Push:` lines or `Pull:`
 lines are used for `git-push` and `git-fetch`/`git-pull`,
 respectively.  Multiple `Push:` and and `Pull:` lines may
 be specified for additional branch mappings.

-+
+

 The name of a file in `$GIT_DIR/branches` directory can be
 specified as an older notation short-hand; the named
 file should contain a single line, a URL in one of the
 The name of a file in `$GIT_DIR/branches` directory can be
 specified as an older notation short-hand; the named
 file should contain a single line, a URL in one of the


@@ -52,11 +58,11 @@ name of remote head (URL fragment notation).
 `$GIT_DIR/branches/<remote>` file that stores a <url>
 without the fragment is equivalent to have this in the
 corresponding file in the `$GIT_DIR/remotes/` directory.
 `$GIT_DIR/branches/<remote>` file that stores a <url>
 without the fragment is equivalent to have this in the
 corresponding file in the `$GIT_DIR/remotes/` directory.

-+
+

        URL: <url>
        Pull: refs/heads/master:<remote>
        URL: <url>
        Pull: refs/heads/master:<remote>

-+
+

 while having `<url>#<head>` is equivalent to
 while having `<url>#<head>` is equivalent to

-+
+

        URL: <url>
        Pull: refs/heads/<head>:<remote>
        URL: <url>
        Pull: refs/heads/<head>:<remote>