From: Junio C Hamano Date: Wed, 6 Dec 2006 21:11:49 +0000 (+0000) Subject: Autogenerated HTML docs for v1.4.4.2-gde51 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=353c3a97e8c7c513731a55dd3a01945eebc7a9d1;p=git.git Autogenerated HTML docs for v1.4.4.2-gde51 --- diff --git a/cvs-migration.html b/cvs-migration.html index fbcb5501e..af8d20547 100644 --- a/cvs-migration.html +++ b/cvs-migration.html @@ -296,6 +296,14 @@ Every working tree contains a repository with a full copy of the for details.

+
  • +

    +Since every working tree contains a repository, a commit in your + private repository will not publish your changes; it will only create + a revision. You have to "push" your changes to a public repository to + make them visible to others. +

    +
    • @@ -343,7 +351,7 @@ variants of this model.

    With a small group, developers may just pull changes from each other's repositories without the need for a central maintainer.

    -

    Emulating the CVS Development Model

    +

    Creating a Shared Repository

    Start with an ordinary git working directory containing the project, and remove the checked-out files, keeping just the bare .git directory:

    @@ -367,7 +375,10 @@ $ GIT_DIR=repo.git git repo-config core.sharedrepository true

    Make sure committers have a umask of at most 027, so that the directories they create are writable and searchable by other group members.

    -

    Suppose this repository is now set up in /pub/repo.git on the host + +

    Performing Development on a Shared Repository

    +
    +

    Suppose a repository is now set up in /pub/repo.git on the host foo.com. Then as an individual committer you can clone the shared repository:

    @@ -399,14 +410,16 @@ Pull: master:origin
    -

    You can update the shared repository with your changes using:

    +

    You can update the shared repository with your changes by first commiting +your changes, and then using:

    $ git push origin master
    -

    If someone else has updated the repository more recently, git push, like -cvs commit, will complain, in which case you must pull any changes -before attempting the push again.

    +

    to "push" those commits to the shared repository. If someone else has +updated the repository more recently, git push, like cvs commit, will +complain, in which case you must pull any changes before attempting the +push again.

    In the git push command above we specify the name of the remote branch to update (master). If we leave that out, git push tries to update any branches in the remote repository that have the same name as a branch @@ -579,7 +592,7 @@ that contain this changed "if" statement:

    diff --git a/cvs-migration.txt b/cvs-migration.txt index 6812683a1..a436180dd 100644 --- a/cvs-migration.txt +++ b/cvs-migration.txt @@ -24,6 +24,11 @@ First, note some ways that git differs from CVS: single shared repository which people can synchronize with; see below for details. + * Since every working tree contains a repository, a commit in your + private repository will not publish your changes; it will only create + a revision. You have to "push" your changes to a public repository to + make them visible to others. + Importing a CVS archive ----------------------- @@ -76,8 +81,8 @@ variants of this model. With a small group, developers may just pull changes from each other's repositories without the need for a central maintainer. -Emulating the CVS Development Model ------------------------------------ +Creating a Shared Repository +---------------------------- Start with an ordinary git working directory containing the project, and remove the checked-out files, keeping just the bare .git directory: @@ -105,7 +110,10 @@ $ GIT_DIR=repo.git git repo-config core.sharedrepository true Make sure committers have a umask of at most 027, so that the directories they create are writable and searchable by other group members. -Suppose this repository is now set up in /pub/repo.git on the host +Performing Development on a Shared Repository +--------------------------------------------- + +Suppose a repository is now set up in /pub/repo.git on the host foo.com. Then as an individual committer you can clone the shared repository: @@ -134,15 +142,17 @@ Pull: master:origin ------------ ================================ -You can update the shared repository with your changes using: +You can update the shared repository with your changes by first commiting +your changes, and then using: ------------------------------------------------ $ git push origin master ------------------------------------------------ -If someone else has updated the repository more recently, `git push`, like -`cvs commit`, will complain, in which case you must pull any changes -before attempting the push again. +to "push" those commits to the shared repository. If someone else has +updated the repository more recently, `git push`, like `cvs commit`, will +complain, in which case you must pull any changes before attempting the +push again. In the `git push` command above we specify the name of the remote branch to update (`master`). If we leave that out, `git push` tries to update