From d3361ad1971d98f2e17e3bb09b77eee7b93700f0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 1 Jan 2007 03:20:24 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.0-rc0-ge900 --- cvs-migration.html | 14 +++++--------- cvs-migration.txt | 11 ++++------- git-clone.html | 13 +++++-------- git-clone.txt | 11 ++++------- git-fetch.html | 27 +++++++++++++++------------ git-pull.html | 27 +++++++++++++++------------ git-push.html | 27 +++++++++++++++------------ glossary.html | 11 ++++++----- glossary.txt | 7 ++++--- hooks.html | 6 +++--- hooks.txt | 4 ++-- tutorial.html | 25 +++++++++++++++---------- tutorial.txt | 25 +++++++++++++++---------- urls.txt | 26 ++++++++++++++------------ 14 files changed, 122 insertions(+), 112 deletions(-) diff --git a/cvs-migration.html b/cvs-migration.html index d87dff6f9..e882687ee 100644 --- a/cvs-migration.html +++ b/cvs-migration.html @@ -296,14 +296,10 @@ them first before running git pull.

Note
-

The first git clone places the following in the -my-project/.git/remotes/origin file, and that's why the previous step -and the next step both work.

-
-
-
URL: foo.com:/pub/project.git/
-Pull: refs/heads/master:refs/remotes/origin/master
-
+

The pull command knows where to get updates from because of certain +configuration variables that were set by the first git clone +command; see git repo-config -l and the git-repo-config(1) man +page for details.

@@ -420,7 +416,7 @@ repositories without the need for a central maintainer.

diff --git a/cvs-migration.txt b/cvs-migration.txt index b657f4589..8e09beaa7 100644 --- a/cvs-migration.txt +++ b/cvs-migration.txt @@ -34,13 +34,10 @@ them first before running git pull. [NOTE] ================================ -The first `git clone` places the following in the -`my-project/.git/remotes/origin` file, and that's why the previous step -and the next step both work. ------------- -URL: foo.com:/pub/project.git/ -Pull: refs/heads/master:refs/remotes/origin/master ------------- +The `pull` command knows where to get updates from because of certain +configuration variables that were set by the first `git clone` +command; see `git repo-config -l` and the gitlink:git-repo-config[1] man +page for details. ================================ You can update the shared repository with your changes by first committing diff --git a/git-clone.html b/git-clone.html index d0f352444..f8bb4345b 100644 --- a/git-clone.html +++ b/git-clone.html @@ -372,8 +372,8 @@ configuration variables.

Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to refs/remotes/origin/. When this option is - used, neither the origin branch nor the default - remotes/origin file is created. + used, neither remote-tracking branches nor the related + configuration variables are created.

@@ -384,11 +384,8 @@ configuration variables.

- Instead of using the branch name origin to keep track - of the upstream repository, use <name> instead. Note - that the shorthand name stored in remotes/origin is - not affected, but the local branch name to pull the - remote master branch into is. + Instead of using the remote name origin to keep track + of the upstream repository, use <name> instead.

@@ -510,7 +507,7 @@ Create a repository on the kernel.org machine that borrows from Linus diff --git a/git-clone.txt b/git-clone.txt index 874934a33..96523204d 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -75,16 +75,13 @@ OPTIONS Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is - used, neither the `origin` branch nor the default - `remotes/origin` file is created. + used, neither remote-tracking branches nor the related + configuration variables are created. --origin :: -o :: - Instead of using the branch name 'origin' to keep track - of the upstream repository, use instead. Note - that the shorthand name stored in `remotes/origin` is - not affected, but the local branch name to pull the - remote `master` branch into is. + Instead of using the remote name 'origin' to keep track + of the upstream repository, use instead. --upload-pack :: -u :: diff --git a/git-fetch.html b/git-fetch.html index 93806b28e..c21c778d5 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -558,9 +558,10 @@ 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>
+

Then such a short-hand is specified in place of <repository> without <refspec> parameters on the command @@ -572,10 +573,11 @@ be specified for additional branch mappings.

of fetch instead of Pull:):

-
[remote "<remote>"]
-        url = <url>
-        push = <refspec>
-        fetch = <refspec>
+
        [remote "<remote>"]
+                url = <url>
+                push = <refspec>
+                fetch = <refspec>
+

The name of a file in $GIT_DIR/branches directory can be specified as an older notation short-hand; the named @@ -587,14 +589,15 @@ 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

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

SEE ALSO

@@ -616,7 +619,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-pull.html b/git-pull.html index a518025cc..78e856e79 100644 --- a/git-pull.html +++ b/git-pull.html @@ -602,9 +602,10 @@ 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>
+

Then such a short-hand is specified in place of <repository> without <refspec> parameters on the command @@ -616,10 +617,11 @@ be specified for additional branch mappings.

of fetch instead of Pull:):

-
[remote "<remote>"]
-        url = <url>
-        push = <refspec>
-        fetch = <refspec>
+
        [remote "<remote>"]
+                url = <url>
+                push = <refspec>
+                fetch = <refspec>
+

The name of a file in $GIT_DIR/branches directory can be specified as an older notation short-hand; the named @@ -631,14 +633,15 @@ 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

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

MERGE STRATEGIES

@@ -818,7 +821,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-push.html b/git-push.html index f586e87d2..746453ced 100644 --- a/git-push.html +++ b/git-push.html @@ -449,9 +449,10 @@ 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>
+

Then such a short-hand is specified in place of <repository> without <refspec> parameters on the command @@ -463,10 +464,11 @@ be specified for additional branch mappings.

of fetch instead of Pull:):

-
[remote "<remote>"]
-        url = <url>
-        push = <refspec>
-        fetch = <refspec>
+
        [remote "<remote>"]
+                url = <url>
+                push = <refspec>
+                fetch = <refspec>
+

The name of a file in $GIT_DIR/branches directory can be specified as an older notation short-hand; the named @@ -478,14 +480,15 @@ 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

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

Author

@@ -503,7 +506,7 @@ by Linus Torvalds <torvalds@osdl.org>

diff --git a/glossary.html b/glossary.html index d3ba43928..d77cbe1c9 100644 --- a/glossary.html +++ b/glossary.html @@ -660,11 +660,12 @@ div.exampleblock-content {

- The default upstream tracking branch. Most - projects have at least one upstream project which they track. By default + The default upstream repository. Most projects have + at least one upstream project which they track. By default origin is used for that purpose. New upstream updates - will be fetched into this branch; you should never - commit to it yourself. + will be fetched into remote tracking branches named + origin/name-of-upstream-branch, which you + can see using "git branch -r".

@@ -980,7 +981,7 @@ the git-list <git@vger.kernel.org>.

diff --git a/glossary.txt b/glossary.txt index 894883d7b..7c1a6592c 100644 --- a/glossary.txt +++ b/glossary.txt @@ -188,11 +188,12 @@ octopus:: predator. origin:: - The default upstream tracking branch. Most projects have at + The default upstream repository. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates - will be fetched into this branch; you should never commit - to it yourself. + will be fetched into remote tracking branches named + origin/name-of-upstream-branch, which you can see using + "git branch -r". pack:: A set of objects which have been compressed into one file (to save diff --git a/hooks.html b/hooks.html index 24656155a..d4faf7f51 100644 --- a/hooks.html +++ b/hooks.html @@ -378,9 +378,9 @@ firing one e-mail per ref when used naively, though.

Another use suggested on the mailing list is to use this hook to implement access control which is finer grained than the one based on filesystem group.

-

The standard output of this hook is sent to /dev/null; if you +

The standard output of this hook is sent to stderr, so if you want to report something to the git-send-pack on the other end, -you can redirect your output to your stderr.

+you can simply echo your messages.

post-update

@@ -406,7 +406,7 @@ you can redirect your output to your stderr.

diff --git a/hooks.txt b/hooks.txt index 517f49b5c..161123f14 100644 --- a/hooks.txt +++ b/hooks.txt @@ -126,9 +126,9 @@ Another use suggested on the mailing list is to use this hook to implement access control which is finer grained than the one based on filesystem group. -The standard output of this hook is sent to `/dev/null`; if you +The standard output of this hook is sent to `stderr`, so if you want to report something to the `git-send-pack` on the other end, -you can redirect your output to your `stderr`. +you can simply `echo` your messages. post-update diff --git a/tutorial.html b/tutorial.html index ddb2dcd19..6b693d6bc 100644 --- a/tutorial.html +++ b/tutorial.html @@ -541,18 +541,23 @@ branch, regardless of what else is given on the commandline.

Note that he doesn't need to give the path to Alice's repository; when Bob cloned Alice's repository, git stored the location of her -repository in the file .git/remotes/origin, and that location is used -as the default for pulls.

-

Bob may also notice a branch in his repository that he didn't create:

+repository in the repository configuration, and that location is +used for pulls:

-
$ git branch
-* master
-  origin
+
$ git repo-config --get remote.origin.url
+/home/bob/myrepo
+
+

(The complete configuration created by git-clone is visible using +"git repo-config -l", and the git-repo-config(1) man page +explains the meaning of each option.)

+

Git also keeps a pristine copy of Alice's master branch under the +name "origin/master":

+
+
+
$ git branch -r
+  origin/master
-

The "origin" branch, which was created automatically by "git clone", -is a pristine copy of Alice's master branch; Bob should never commit -to it.

If Bob later decides to work from a different host, he can still perform clones and pulls using the ssh protocol:

@@ -762,7 +767,7 @@ digressions that may be interesting at this point are:

diff --git a/tutorial.txt b/tutorial.txt index cb808d924..d043e844d 100644 --- a/tutorial.txt +++ b/tutorial.txt @@ -323,20 +323,25 @@ $ git pull Note that he doesn't need to give the path to Alice's repository; when Bob cloned Alice's repository, git stored the location of her -repository in the file .git/remotes/origin, and that location is used -as the default for pulls. - -Bob may also notice a branch in his repository that he didn't create: +repository in the repository configuration, and that location is +used for pulls: ------------------------------------- -$ git branch -* master - origin +$ git repo-config --get remote.origin.url +/home/bob/myrepo ------------------------------------- -The "origin" branch, which was created automatically by "git clone", -is a pristine copy of Alice's master branch; Bob should never commit -to it. +(The complete configuration created by git-clone is visible using +"git repo-config -l", and the gitlink:git-repo-config[1] man page +explains the meaning of each option.) + +Git also keeps a pristine copy of Alice's master branch under the +name "origin/master": + +------------------------------------- +$ git branch -r + origin/master +------------------------------------- If Bob later decides to work from a different host, he can still perform clones and pulls using the ssh protocol: diff --git a/urls.txt b/urls.txt index 870c95073..745f9677d 100644 --- a/urls.txt +++ b/urls.txt @@ -41,9 +41,10 @@ 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: -Pull: + URL: one of the above URL format + Push: + Pull: + ------------ Then such a short-hand is specified in place of @@ -57,10 +58,11 @@ Or, equivalently, in the `$GIT_DIR/config` (note the use of `fetch` instead of `Pull:`): ------------ -[remote ""] - url = - push = - fetch = + [remote ""] + url = + push = + fetch = + ------------ The name of a file in `$GIT_DIR/branches` directory can be @@ -73,14 +75,14 @@ without the fragment is equivalent to have this in the corresponding file in the `$GIT_DIR/remotes/` directory. ------------ -URL: -Pull: refs/heads/master: ------------- + URL: + Pull: refs/heads/master: +------------ while having `#` is equivalent to ------------ -URL: -Pull: refs/heads/: + URL: + Pull: refs/heads/: ------------ -- 2.26.2