<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" | |
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> | |
<head> | |
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> | |
<meta name="generator" content="AsciiDoc 7.0.2" /> | |
<style type="text/css"> | |
/* Debug borders */ | |
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { | |
/* | |
border: 1px solid red; | |
*/ | |
} | |
body { | |
margin: 1em 5% 1em 5%; | |
} | |
a { color: blue; } | |
a:visited { color: fuchsia; } | |
em { | |
font-style: italic; | |
} | |
strong { | |
font-weight: bold; | |
} | |
tt { | |
color: navy; | |
} | |
h1, h2, h3, h4, h5, h6 { | |
color: #527bbd; | |
font-family: sans-serif; | |
margin-top: 1.2em; | |
margin-bottom: 0.5em; | |
line-height: 1.3; | |
} | |
h1 { | |
border-bottom: 2px solid silver; | |
} | |
h2 { | |
border-bottom: 2px solid silver; | |
padding-top: 0.5em; | |
} | |
div.sectionbody { | |
font-family: serif; | |
margin-left: 0; | |
} | |
hr { | |
border: 1px solid silver; | |
} | |
p { | |
margin-top: 0.5em; | |
margin-bottom: 0.5em; | |
} | |
pre { | |
padding: 0; | |
margin: 0; | |
} | |
span#author { | |
color: #527bbd; | |
font-family: sans-serif; | |
font-weight: bold; | |
font-size: 1.2em; | |
} | |
span#email { | |
} | |
span#revision { | |
font-family: sans-serif; | |
} | |
div#footer { | |
font-family: sans-serif; | |
font-size: small; | |
border-top: 2px solid silver; | |
padding-top: 0.5em; | |
margin-top: 4.0em; | |
} | |
div#footer-text { | |
float: left; | |
padding-bottom: 0.5em; | |
} | |
div#footer-badges { | |
float: right; | |
padding-bottom: 0.5em; | |
} | |
div#preamble, | |
div.tableblock, div.imageblock, div.exampleblock, div.verseblock, | |
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, | |
div.admonitionblock { | |
margin-right: 10%; | |
margin-top: 1.5em; | |
margin-bottom: 1.5em; | |
} | |
div.admonitionblock { | |
margin-top: 2.5em; | |
margin-bottom: 2.5em; | |
} | |
div.content { /* Block element content. */ | |
padding: 0; | |
} | |
/* Block element titles. */ | |
div.title, caption.title { | |
font-family: sans-serif; | |
font-weight: bold; | |
text-align: left; | |
margin-top: 1.0em; | |
margin-bottom: 0.5em; | |
} | |
div.title + * { | |
margin-top: 0; | |
} | |
td div.title:first-child { | |
margin-top: 0.0em; | |
} | |
div.content div.title:first-child { | |
margin-top: 0.0em; | |
} | |
div.content + div.title { | |
margin-top: 0.0em; | |
} | |
div.sidebarblock > div.content { | |
background: #ffffee; | |
border: 1px solid silver; | |
padding: 0.5em; | |
} | |
div.listingblock > div.content { | |
border: 1px solid silver; | |
background: #f4f4f4; | |
padding: 0.5em; | |
} | |
div.quoteblock > div.content { | |
padding-left: 2.0em; | |
} | |
div.quoteblock .attribution { | |
text-align: right; | |
} | |
div.admonitionblock .icon { | |
vertical-align: top; | |
font-size: 1.1em; | |
font-weight: bold; | |
text-decoration: underline; | |
color: #527bbd; | |
padding-right: 0.5em; | |
} | |
div.admonitionblock td.content { | |
padding-left: 0.5em; | |
border-left: 2px solid silver; | |
} | |
div.exampleblock > div.content { | |
border-left: 2px solid silver; | |
padding: 0.5em; | |
} | |
div.verseblock div.content { | |
white-space: pre; | |
} | |
div.imageblock div.content { padding-left: 0; } | |
div.imageblock img { border: 1px solid silver; } | |
span.image img { border-style: none; } | |
dl { | |
margin-top: 0.8em; | |
margin-bottom: 0.8em; | |
} | |
dt { | |
margin-top: 0.5em; | |
margin-bottom: 0; | |
font-style: italic; | |
} | |
dd > *:first-child { | |
margin-top: 0; | |
} | |
ul, ol { | |
list-style-position: outside; | |
} | |
ol.olist2 { | |
list-style-type: lower-alpha; | |
} | |
div.tableblock > table { | |
border-color: #527bbd; | |
border-width: 3px; | |
} | |
thead { | |
font-family: sans-serif; | |
font-weight: bold; | |
} | |
tfoot { | |
font-weight: bold; | |
} | |
div.hlist { | |
margin-top: 0.8em; | |
margin-bottom: 0.8em; | |
} | |
td.hlist1 { | |
vertical-align: top; | |
font-style: italic; | |
padding-right: 0.8em; | |
} | |
td.hlist2 { | |
vertical-align: top; | |
} | |
@media print { | |
div#footer-badges { display: none; } | |
} | |
/* Workarounds for IE6's broken and incomplete CSS2. */ | |
div.sidebar-content { | |
background: #ffffee; | |
border: 1px solid silver; | |
padding: 0.5em; | |
} | |
div.sidebar-title, div.image-title { | |
font-family: sans-serif; | |
font-weight: bold; | |
margin-top: 0.0em; | |
margin-bottom: 0.5em; | |
} | |
div.listingblock div.content { | |
border: 1px solid silver; | |
background: #f4f4f4; | |
padding: 0.5em; | |
} | |
div.quoteblock-content { | |
padding-left: 2.0em; | |
} | |
div.exampleblock-content { | |
border-left: 2px solid silver; | |
padding-left: 0.5em; | |
} | |
</style> | |
<title>git for CVS users</title> | |
</head> | |
<body> | |
<div id="header"> | |
<h1>git for CVS users</h1> | |
</div> | |
<div id="preamble"> | |
<div class="sectionbody"> | |
<p>Git differs from CVS in that every working tree contains a repository with | |
a full copy of the project history, and no repository is inherently more | |
important than any other. However, you can emulate the CVS model by | |
designating a single shared repository which people can synchronize with; | |
this document explains how to do that.</p> | |
<p>Some basic familiarity with git is required. This | |
<a href="tutorial.html">tutorial introduction to git</a> and the | |
<a href="glossary.html">git glossary</a> should be sufficient.</p> | |
</div> | |
</div> | |
<h2>Developing against a shared repository</h2> | |
<div class="sectionbody"> | |
<p>Suppose a shared repository is set up in /pub/repo.git on the host | |
foo.com. Then as an individual committer you can clone the shared | |
repository over ssh with:</p> | |
<div class="listingblock"> | |
<div class="content"> | |
<pre><tt>$ git clone foo.com:/pub/repo.git/ my-project | |
$ cd my-project</tt></pre> | |
</div></div> | |
<p>and hack away. The equivalent of <tt>cvs update</tt> is</p> | |
<div class="listingblock"> | |
<div class="content"> | |
<pre><tt>$ git pull origin</tt></pre> | |
</div></div> | |
<p>which merges in any work that others might have done since the clone | |
operation. If there are uncommitted changes in your working tree, commit | |
them first before running git pull.</p> | |
<div class="admonitionblock"> | |
<table><tr> | |
<td class="icon"> | |
<div class="title">Note</div> | |
</td> | |
<td class="content"> | |
<p>The <tt>pull</tt> command knows where to get updates from because of certain | |
configuration variables that were set by the first <tt>git clone</tt> | |
command; see <tt>git config -l</tt> and the <a href="git-config.html">git-config(1)</a> man | |
page for details.</p> | |
</td> | |
</tr></table> | |
</div> | |
<p>You can update the shared repository with your changes by first committing | |
your changes, and then using the <a href="git-push.html">git-push(1)</a> command:</p> | |
<div class="listingblock"> | |
<div class="content"> | |
<pre><tt>$ git push origin master</tt></pre> | |
</div></div> | |
<p>to "push" those commits to the shared repository. If someone else has | |
updated the repository more recently, <tt>git push</tt>, like <tt>cvs commit</tt>, will | |
complain, in which case you must pull any changes before attempting the | |
push again.</p> | |
<p>In the <tt>git push</tt> command above we specify the name of the remote branch | |
to update (<tt>master</tt>). If we leave that out, <tt>git push</tt> tries to update | |
any branches in the remote repository that have the same name as a branch | |
in the local repository. So the last <tt>push</tt> can be done with either of:</p> | |
<div class="listingblock"> | |
<div class="content"> | |
<pre><tt>$ git push origin | |
$ git push foo.com:/pub/project.git/</tt></pre> | |
</div></div> | |
<p>as long as the shared repository does not have any branches | |
other than <tt>master</tt>.</p> | |
</div> | |
<h2>Setting Up a Shared Repository</h2> | |
<div class="sectionbody"> | |
<p>We assume you have already created a git repository for your project, | |
possibly created from scratch or from a tarball (see the | |
<a href="tutorial.html">tutorial</a>), or imported from an already existing CVS | |
repository (see the next section).</p> | |
<p>Assume your existing repo is at /home/alice/myproject. Create a new "bare" | |
repository (a repository without a working tree) and fetch your project into | |
it:</p> | |
<div class="listingblock"> | |
<div class="content"> | |
<pre><tt>$ mkdir /pub/my-repo.git | |
$ cd /pub/my-repo.git | |
$ git --bare init --shared | |
$ git --bare fetch /home/alice/myproject master:master</tt></pre> | |
</div></div> | |
<p>Next, give every team member read/write access to this repository. One | |
easy way to do this is to give all the team members ssh access to the | |
machine where the repository is hosted. If you don't want to give them a | |
full shell on the machine, there is a restricted shell which only allows | |
users to do git pushes and pulls; see <a href="git-shell.html">git-shell(1)</a>.</p> | |
<p>Put all the committers in the same group, and make the repository | |
writable by that group:</p> | |
<div class="listingblock"> | |
<div class="content"> | |
<pre><tt>$ chgrp -R $group /pub/my-repo.git</tt></pre> | |
</div></div> | |
<p>Make sure committers have a umask of at most 027, so that the directories | |
they create are writable and searchable by other group members.</p> | |
</div> | |
<h2>Importing a CVS archive</h2> | |
<div class="sectionbody"> | |
<p>First, install version 2.1 or higher of cvsps from | |
<a href="http://www.cobite.com/cvsps/">http://www.cobite.com/cvsps/</a> and make | |
sure it is in your path. Then cd to a checked out CVS working directory | |
of the project you are interested in and run <a href="git-cvsimport.html">git-cvsimport(1)</a>:</p> | |
<div class="listingblock"> | |
<div class="content"> | |
<pre><tt>$ git cvsimport -C <destination> <module></tt></pre> | |
</div></div> | |
<p>This puts a git archive of the named CVS module in the directory | |
<destination>, which will be created if necessary.</p> | |
<p>The import checks out from CVS every revision of every file. Reportedly | |
cvsimport can average some twenty revisions per second, so for a | |
medium-sized project this should not take more than a couple of minutes. | |
Larger projects or remote repositories may take longer.</p> | |
<p>The main trunk is stored in the git branch named <tt>origin</tt>, and additional | |
CVS branches are stored in git branches with the same names. The most | |
recent version of the main trunk is also left checked out on the <tt>master</tt> | |
branch, so you can start adding your own changes right away.</p> | |
<p>The import is incremental, so if you call it again next month it will | |
fetch any CVS updates that have been made in the meantime. For this to | |
work, you must not modify the imported branches; instead, create new | |
branches for your own changes, and merge in the imported branches as | |
necessary.</p> | |
</div> | |
<h2>Advanced Shared Repository Management</h2> | |
<div class="sectionbody"> | |
<p>Git allows you to specify scripts called "hooks" to be run at certain | |
points. You can use these, for example, to send all commits to the shared | |
repository to a mailing list. See <a href="hooks.html">Hooks used by git</a>.</p> | |
<p>You can enforce finer grained permissions using update hooks. See | |
<a href="howto/update-hook-example.txt">Controlling access to branches using | |
update hooks</a>.</p> | |
</div> | |
<h2>Providing CVS Access to a git Repository</h2> | |
<div class="sectionbody"> | |
<p>It is also possible to provide true CVS access to a git repository, so | |
that developers can still use CVS; see <a href="git-cvsserver.html">git-cvsserver(1)</a> for | |
details.</p> | |
</div> | |
<h2>Alternative Development Models</h2> | |
<div class="sectionbody"> | |
<p>CVS users are accustomed to giving a group of developers commit access to | |
a common repository. As we've seen, this is also possible with git. | |
However, the distributed nature of git allows other development models, | |
and you may want to first consider whether one of them might be a better | |
fit for your project.</p> | |
<p>For example, you can choose a single person to maintain the project's | |
primary public repository. Other developers then clone this repository | |
and each work in their own clone. When they have a series of changes that | |
they're happy with, they ask the maintainer to pull from the branch | |
containing the changes. The maintainer reviews their changes and pulls | |
them into the primary repository, which other developers pull from as | |
necessary to stay coordinated. The Linux kernel and other projects use | |
variants of this model.</p> | |
<p>With a small group, developers may just pull changes from each other's | |
repositories without the need for a central maintainer.</p> | |
</div> | |
<div id="footer"> | |
<div id="footer-text"> | |
Last updated 26-Apr-2008 02:23:17 UTC | |
</div> | |
</div> | |
</body> | |
</html> |