summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3a9f1a5)
raw | patch | inline | side by side (parent: 3a9f1a5)
author | J. Bruce Fields <bfields@fieldses.org> | |
Wed, 6 Dec 2006 17:19:50 +0000 (12:19 -0500) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 6 Dec 2006 17:53:33 +0000 (09:53 -0800) |
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>
obvious. Also clarify that changes have to be commited before they can
be pushed.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/cvs-migration.txt | patch | blob | history |
index 9c2a395e5ac9435f5d42d10837694e2fe13d6c63..a436180dd417f39b812d54df5168c89b501d5193 100644 (file)
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:
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:
------------
================================
-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