index 41ad6087e5d39eff35b8b37c66cba732d71f2ee9..aaa7ef737a4c190c60e37e2849ce42f3bdb5dda7 100644 (file)
$ cd my-project
------------------------------------------------
$ cd my-project
------------------------------------------------
-and hack away. The equivalent of `cvs update` is
+and hack away. The equivalent of 'cvs update' is
------------------------------------------------
$ git pull origin
------------------------------------------------
$ git pull origin
[NOTE]
================================
[NOTE]
================================
-The `pull` command knows where to get updates from because of certain
+The 'pull' command knows where to get updates from because of certain
configuration variables that were set by the first 'git-clone'
command; see `git config -l` and the linkgit:git-config[1] man
page for details.
configuration variables that were set by the first 'git-clone'
command; see `git config -l` and the linkgit:git-config[1] man
page for details.
------------------------------------------------
to "push" those commits to the shared repository. If someone else has
------------------------------------------------
to "push" those commits to the shared repository. If someone else has
-updated the repository more recently, 'git-push', like `cvs commit`, will
+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
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
-in the local repository. So the last `push` can be done with either of:
+in the local repository. So the last 'push' can be done with either of:
------------
$ git push origin
------------
$ git push origin
branches for your own changes, and merge in the imported branches as
necessary.
branches for your own changes, and merge in the imported branches as
necessary.
+If you want a shared repository, you will need to make a bare clone
+of the imported directory, as described above. Then treat the imported
+directory as another development clone for purposes of merging
+incremental imports.
+
Advanced Shared Repository Management
-------------------------------------
Advanced Shared Repository Management
-------------------------------------