diff options
| author | J. Bruce Fields <bfields@fieldses.org> | 2006-12-06 12:19:50 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-06 09:53:33 -0800 |
| commit | 4003a58e415e5f51a3becac0079505b72299a7bc (patch) | |
| tree | 2a6cb945e34b72ae62d893132cb91100e5a9d059 | |
| parent | 3a9f1a55eec9cc508abccda6a3fee795b812d66d (diff) | |
| download | git-4003a58e415e5f51a3becac0079505b72299a7bc.tar.gz git-4003a58e415e5f51a3becac0079505b72299a7bc.tar.xz | |
cvs-migration: improved section titles, better push/commit explanation
Rename the section titles to make the "how-to" content of the section
obvious. Also clarify that changes have to be commited before they can
be pushed.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/cvs-migration.txt | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt index 9c2a395e5..a436180dd 100644 --- a/Documentation/cvs-migration.txt +++ b/Documentation/cvs-migration.txt @@ -81,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: @@ -110,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: @@ -139,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 |