{"thread":{"id":"3255","subject":"[PATCH 3/3] Docs: minor git-push copyediting","startedAt":"2006-02-07T03:22:48Z","lastAt":"2006-02-07T03:22:55Z","messageCount":2,"participants":["J. Bruce Fields"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"15659","messageId":"1139282428.ec02f402.2@fieldses.org","threadId":"3255","inReplyTo":"1139282428.ec02f402.1@fieldses.org","subject":"[PATCH 3/3] Docs: minor git-push copyediting","fromName":"J. Bruce Fields","fromEmail":"bfields@fieldses.org","sentAt":"2006-02-07T03:22:48Z","receivedAt":"2006-02-07T03:22:48Z","isPatch":true,"sender":{"key":"bfields@citi.umich.edu","avatar":null},"body":"Minor git-push copyediting\n\nSigned-off-by: J. Bruce Fields \n\n---\n\n Documentation/git-push.txt | 6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\na9a95125f25c8f70fe52ab0e30fe5ff6473d7679\ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\nindex ce909f5..5b89110 100644\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -16,7 +16,7 @@ DESCRIPTION\n Updates remote refs using local refs, while sending objects\n necessary to complete the given refs.\n \n-You can make \"interesting\" things to happen on the repository\n+You can make interesting things happen to a repository\n every time you push into it, by setting up 'hooks' there. See\n documentation for gitlink:git-receive-pack[1].\n \n@@ -51,8 +51,8 @@ Some short-cut notations are also suppor\n in the source.\n \n \\--all::\n-\tInstead of naming each ref to push, specifies all refs\n-\tto be pushed.\n+\tInstead of naming each ref to push, specifies that all\n+\trefs be pushed.\n \n \\--tags::\n \tAll refs under `$GIT_DIR/refs/tags` are pushed, in\n-- \n0.99.8b.g3480-dirty\n"},{"id":"15660","messageId":"1139282428.ec02f402.1@fieldses.org","threadId":"3255","inReplyTo":"1139282428.ec02f402.0@fieldses.org","subject":"[PATCH 2/3] Docs: move git url and remotes text to separate sections","fromName":"J. Bruce Fields","fromEmail":"bfields@fieldses.org","sentAt":"2006-02-07T03:22:55Z","receivedAt":"2006-02-07T03:22:55Z","isPatch":true,"sender":{"key":"bfields@citi.umich.edu","avatar":null},"body":"The sections on git urls and remotes files in the git-fetch,\ngit-pull, and git-push manpages seem long enough to be worth a\nmanpage section of their own.\n\nSigned-off-by: J. Bruce Fields \n\n---\n\n Documentation/git-fetch.txt | 2 +-\n Documentation/git-pull.txt | 3 ++-\n Documentation/git-push.txt | 5 +++--\n Documentation/pull-fetch-param.txt | 3 +--\n Documentation/urls.txt | 32 +++++++++++++++++++-------------\n 5 files changed, 26 insertions(+), 19 deletions(-)\n\n6f35b7d338781d0ad18980045cdc6ff4fe0a7b98\ndiff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt\nindex d1b45f9..a67dc34 100644\n--- a/Documentation/git-fetch.txt\n+++ b/Documentation/git-fetch.txt\n@@ -27,7 +27,7 @@ include::fetch-options.txt[]\n \n include::pull-fetch-param.txt[]\n \n-\n+include::urls.txt[]\n \n SEE ALSO\n --------\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 3a7d385..20175f4 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -29,8 +29,9 @@ include::fetch-options.txt[]\n \n include::pull-fetch-param.txt[]\n \n-include::merge-strategies.txt[]\n+include::urls.txt[]\n \n+include::merge-strategies.txt[]\n \n EXAMPLES\n --------\ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\nindex 7e9452e..ce909f5 100644\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -24,8 +24,8 @@ documentation for gitlink:git-receive-pa\n OPTIONS\n -------\n ::\n-\tThe \"remote\" repository that is destination of a push operation.\n-include::urls.txt[]\n+\tThe \"remote\" repository that is destination of a push\n+\toperation. See the section <> below.\n \n ::\n \tThe canonical format of a parameter is\n@@ -65,6 +65,7 @@ Some short-cut notations are also suppor\n \tThis flag disables the check. This can cause the\n \tremote repository to lose commits; use it with care.\n \n+include::urls.txt[]\n \n Author\n ------\ndiff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt\nindex 9011ffb..e852f41 100644\n--- a/Documentation/pull-fetch-param.txt\n+++ b/Documentation/pull-fetch-param.txt\n@@ -1,7 +1,6 @@\n ::\n \tThe \"remote\" repository that is the source of a fetch\n-\tor pull operation.\n-include::urls.txt[]\n+\tor pull operation. See the section <> below.\n \n ::\n \tThe canonical format of a parameter is\ndiff --git a/Documentation/urls.txt b/Documentation/urls.txt\nindex e027c71..7477413 100644\n--- a/Documentation/urls.txt\n+++ b/Documentation/urls.txt\n@@ -1,6 +1,9 @@\n+GIT URLS[[URLS]]\n+----------------\n+\n One of the following notations can be used\n to name the remote repository:\n-+\n+\n ===============================================================\n - rsync://host.xz/path/to/repo.git/\n - http://host.xz/path/to/repo.git/\n@@ -11,39 +14,42 @@ to name the remote repository:\n - ssh://host.xz/~user/path/to/repo.git/\n - ssh://host.xz/~/path/to/repo.git\n ===============================================================\n-+\n+\n SSH Is the default transport protocol and also supports an\n scp-like syntax. Both syntaxes support username expansion,\n as does the native git protocol. The following three are\n identical to the last three above, respectively:\n-+\n+\n ===============================================================\n - host.xz:/path/to/repo.git/\n - host.xz:~user/path/to/repo.git/\n - host.xz:path/to/repo.git\n ===============================================================\n-+\n+\n To sync with a local directory, use:\n-+\n+\n ===============================================================\n - /path/to/repo.git/\n ===============================================================\n-+\n+\n+REMOTES\n+-------\n+\n In addition to the above, as a short-hand, the name of a\n file in `$GIT_DIR/remotes` directory can be given; the\n named file should be in the following format:\n-+\n+\n \tURL: one of the above URL format\n \tPush: \n \tPull: \n-+\n-When such a short-hand is specified in place of\n+\n+Then such a short-hand is specified in place of\n without parameters on the command\n line, specified on `Push:` lines or `Pull:`\n lines are used for `git-push` and `git-fetch`/`git-pull`,\n respectively. Multiple `Push:` and and `Pull:` lines may\n be specified for additional branch mappings.\n-+\n+\n The name of a file in `$GIT_DIR/branches` directory can be\n specified as an older notation short-hand; the named\n file should contain a single line, a URL in one of the\n@@ -52,11 +58,11 @@ name of remote head (URL fragment notati\n `$GIT_DIR/branches/` file that stores a \n without the fragment is equivalent to have this in the\n corresponding file in the `$GIT_DIR/remotes/` directory.\n-+\n+\n \tURL: \n \tPull: refs/heads/master:\n-+\n+\n while having `#` is equivalent to\n-+\n+\n \tURL: \n \tPull: refs/heads/:\n-- \n0.99.8b.g3480-dirty\n"}]}