@matheusbsbs / matheus-bagliano / commits / 4003a58e41
Fork 0

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>

J. Bruce Fields committed Dec 6, 2006 at 12:19 UTC 4003a58e415e5f51a3becac0079505b72299a7bc
1 file changed +12 -7
Documentation/cvs-migration.txt
+12 -7
@@ -81,8 +81,8 @@ variants of this model.
81 With a small group, developers may just pull changes from each other's
82 repositories without the need for a central maintainer.
83
84 -Emulating the CVS Development Model
85 ------------------------------------
84 +Creating a Shared Repository
85 +----------------------------
86
87 Start with an ordinary git working directory containing the project, and
88 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
110 Make sure committers have a umask of at most 027, so that the directories
111 they create are writable and searchable by other group members.
112
113 -Suppose this repository is now set up in /pub/repo.git on the host
113 +Performing Development on a Shared Repository
114 +---------------------------------------------
115 +
116 +Suppose a repository is now set up in /pub/repo.git on the host
117 foo.com. Then as an individual committer you can clone the shared
118 repository:
119
@@ -139,15 +142,17 @@ Pull: master:origin
142 ------------
143 ================================
144
142 -You can update the shared repository with your changes using:
145 +You can update the shared repository with your changes by first commiting
146 +your changes, and then using:
147
148 ------------------------------------------------
149 $ git push origin master
150 ------------------------------------------------
151
148 -If someone else has updated the repository more recently, `git push`, like
149 -`cvs commit`, will complain, in which case you must pull any changes
150 -before attempting the push again.
152 +to "push" those commits to the shared repository. If someone else has
153 +updated the repository more recently, `git push`, like `cvs commit`, will
154 +complain, in which case you must pull any changes before attempting the
155 +push again.
156
157 In the `git push` command above we specify the name of the remote branch
158 to update (`master`). If we leave that out, `git push` tries to update