undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cvs-migration: improved section titles, better push/commit explanation

Browse Source 
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>
This commit is contained in:
J. Bruce Fields 2006-12-06 12:19:50 -05:00 committed by Junio C Hamano
parent 3a9f1a55ee
commit 4003a58e41
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Documentation/cvs-migration.txt
View File

@ -81,8 +81,8 @@ variants of this model.
With a small group, developers may just pull changes from each other's With a small group, developers may just pull changes from each other's
repositories without the need for a central maintainer. 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 Start with an ordinary git working directory containing the project, and
remove the checked-out files, keeping just the bare .git directory: 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 Make sure committers have a umask of at most 027, so that the directories
they create are writable and searchable by other group members. 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 foo.com. Then as an individual committer you can clone the shared
repository: 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 $ git push origin master
------------------------------------------------ ------------------------------------------------
If someone else has updated the repository more recently, `git push`, like to "push" those commits to the shared repository. If someone else has
`cvs commit`, will complain, in which case you must pull any changes updated the repository more recently, `git push`, like `cvs commit`, will
before attempting the push again. 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 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 to update (`master`). If we leave that out, `git push` tries to update