Google Git
Sign in
chromium / external / gitster / git-htmldocs / f94fd6c7dfaf86f2c489e22ab7a67914168e052a / . / gitcvs-migration.html
blob: 9d77b9df6aad4b90ced98647b392d9e7eeb058a9 [file] [log] [blame]
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]6<meta name="generator" content="AsciiDoc 8.5.2" />
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]7<title>gitcvs-migration(7)</title>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]8<style type="text/css">
9/* Debug borders */
10p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
11/*
12 border: 1px solid red;
13*/
14}
15
16body {
17 margin: 1em 5% 1em 5%;
18}
19
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]20a {
21 color: blue;
22 text-decoration: underline;
23}
24a:visited {
25 color: fuchsia;
26}
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]27
28em {
29 font-style: italic;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]30 color: navy;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]31}
32
33strong {
34 font-weight: bold;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]35 color: #083194;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]36}
37
38tt {
39 color: navy;
40}
41
42h1, h2, h3, h4, h5, h6 {
43 color: #527bbd;
44 font-family: sans-serif;
45 margin-top: 1.2em;
46 margin-bottom: 0.5em;
47 line-height: 1.3;
48}
49
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]50h1, h2, h3 {
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]51 border-bottom: 2px solid silver;
52}
53h2 {
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]54 padding-top: 0.5em;
55}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]56h3 {
57 float: left;
58}
59h3 + * {
60 clear: left;
61}
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]62
63div.sectionbody {
64 font-family: serif;
65 margin-left: 0;
66}
67
68hr {
69 border: 1px solid silver;
70}
71
72p {
73 margin-top: 0.5em;
74 margin-bottom: 0.5em;
75}
76
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]77ul, ol, li > p {
78 margin-top: 0;
79}
80
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]81pre {
82 padding: 0;
83 margin: 0;
84}
85
86span#author {
87 color: #527bbd;
88 font-family: sans-serif;
89 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]90 font-size: 1.1em;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]91}
92span#email {
93}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]94span#revnumber, span#revdate, span#revremark {
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]95 font-family: sans-serif;
96}
97
98div#footer {
99 font-family: sans-serif;
100 font-size: small;
101 border-top: 2px solid silver;
102 padding-top: 0.5em;
103 margin-top: 4.0em;
104}
105div#footer-text {
106 float: left;
107 padding-bottom: 0.5em;
108}
109div#footer-badges {
110 float: right;
111 padding-bottom: 0.5em;
112}
113
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]114div#preamble {
115 margin-top: 1.5em;
116 margin-bottom: 1.5em;
117}
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]118div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
119div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
120div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]121 margin-top: 1.0em;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]122 margin-bottom: 1.5em;
123}
124div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]125 margin-top: 2.0em;
126 margin-bottom: 2.0em;
127 margin-right: 10%;
128 color: #606060;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]129}
130
131div.content { /* Block element content. */
132 padding: 0;
133}
134
135/* Block element titles. */
136div.title, caption.title {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]137 color: #527bbd;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]138 font-family: sans-serif;
139 font-weight: bold;
140 text-align: left;
141 margin-top: 1.0em;
142 margin-bottom: 0.5em;
143}
144div.title + * {
145 margin-top: 0;
146}
147
148td div.title:first-child {
149 margin-top: 0.0em;
150}
151div.content div.title:first-child {
152 margin-top: 0.0em;
153}
154div.content + div.title {
155 margin-top: 0.0em;
156}
157
158div.sidebarblock > div.content {
159 background: #ffffee;
160 border: 1px solid silver;
161 padding: 0.5em;
162}
163
164div.listingblock > div.content {
165 border: 1px solid silver;
166 background: #f4f4f4;
167 padding: 0.5em;
168}
169
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]170div.quoteblock, div.verseblock {
171 padding-left: 1.0em;
172 margin-left: 1.0em;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]173 margin-right: 10%;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]174 border-left: 5px solid #dddddd;
175 color: #777777;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]176}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]177
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]178div.quoteblock > div.attribution {
179 padding-top: 0.5em;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]180 text-align: right;
181}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]182
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]183div.verseblock > div.content {
184 white-space: pre;
185}
186div.verseblock > div.attribution {
187 padding-top: 0.75em;
188 text-align: left;
189}
190/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]191div.verseblock + div.attribution {
192 text-align: left;
193}
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]194
195div.admonitionblock .icon {
196 vertical-align: top;
197 font-size: 1.1em;
198 font-weight: bold;
199 text-decoration: underline;
200 color: #527bbd;
201 padding-right: 0.5em;
202}
203div.admonitionblock td.content {
204 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]205 border-left: 3px solid #dddddd;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]206}
207
208div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]209 border-left: 3px solid #dddddd;
210 padding-left: 0.5em;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]211}
212
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]213div.imageblock div.content { padding-left: 0; }
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]214span.image img { border-style: none; }
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]215a.image:visited { color: white; }
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]216
217dl {
218 margin-top: 0.8em;
219 margin-bottom: 0.8em;
220}
221dt {
222 margin-top: 0.5em;
223 margin-bottom: 0;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]224 font-style: normal;
225 color: navy;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]226}
227dd > *:first-child {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]228 margin-top: 0.1em;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]229}
230
231ul, ol {
232 list-style-position: outside;
233}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]234ol.arabic {
235 list-style-type: decimal;
236}
237ol.loweralpha {
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]238 list-style-type: lower-alpha;
239}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]240ol.upperalpha {
241 list-style-type: upper-alpha;
242}
243ol.lowerroman {
244 list-style-type: lower-roman;
245}
246ol.upperroman {
247 list-style-type: upper-roman;
248}
249
250div.compact ul, div.compact ol,
251div.compact p, div.compact p,
252div.compact div, div.compact div {
253 margin-top: 0.1em;
254 margin-bottom: 0.1em;
255}
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]256
257div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]258 border: 3px solid #527bbd;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]259}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]260thead, p.table.header {
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]261 font-family: sans-serif;
262 font-weight: bold;
263}
264tfoot {
265 font-weight: bold;
266}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]267td > div.verse {
268 white-space: pre;
269}
270p.table {
271 margin-top: 0;
272}
273/* Because the table frame attribute is overriden by CSS in most browsers. */
274div.tableblock > table[frame="void"] {
275 border-style: none;
276}
277div.tableblock > table[frame="hsides"] {
278 border-left-style: none;
279 border-right-style: none;
280}
281div.tableblock > table[frame="vsides"] {
282 border-top-style: none;
283 border-bottom-style: none;
284}
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]285
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]286
287div.hdlist {
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]288 margin-top: 0.8em;
289 margin-bottom: 0.8em;
290}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]291div.hdlist tr {
292 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]293}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]294dt.hdlist1.strong, td.hdlist1.strong {
295 font-weight: bold;
296}
297td.hdlist1 {
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]298 vertical-align: top;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]299 font-style: normal;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]300 padding-right: 0.8em;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]301 color: navy;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]302}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]303td.hdlist2 {
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]304 vertical-align: top;
305}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]306div.hdlist.compact tr {
307 margin: 0;
308 padding-bottom: 0;
309}
310
311.comment {
312 background: yellow;
313}
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]314
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]315.footnote, .footnoteref {
316 font-size: 0.8em;
317}
318
319span.footnote, span.footnoteref {
320 vertical-align: super;
321}
322
323#footnotes {
324 margin: 20px 0 20px 0;
325 padding: 7px 0 0 0;
326}
327
328#footnotes div.footnote {
329 margin: 0 0 5px 0;
330}
331
332#footnotes hr {
333 border: none;
334 border-top: 1px solid silver;
335 height: 1px;
336 text-align: left;
337 margin-left: 0;
338 width: 20%;
339 min-width: 100px;
340}
341
342
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]343@media print {
344 div#footer-badges { display: none; }
345}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]346
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]347div#toc {
348 margin-bottom: 2.5em;
349}
350
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]351div#toctitle {
352 color: #527bbd;
353 font-family: sans-serif;
354 font-size: 1.1em;
355 font-weight: bold;
356 margin-top: 1.0em;
357 margin-bottom: 0.1em;
358}
359
360div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
361 margin-top: 0;
362 margin-bottom: 0;
363}
364div.toclevel2 {
365 margin-left: 2em;
366 font-size: 0.9em;
367}
368div.toclevel3 {
369 margin-left: 4em;
370 font-size: 0.9em;
371}
372div.toclevel4 {
373 margin-left: 6em;
374 font-size: 0.9em;
375}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]376/* Overrides for manpage documents */
377h1 {
378 padding-top: 0.5em;
379 padding-bottom: 0.5em;
380 border-top: 2px solid silver;
381 border-bottom: 2px solid silver;
382}
383h2 {
384 border-style: none;
385}
386div.sectionbody {
387 margin-left: 5%;
388}
389
390@media print {
391 div#toc { display: none; }
392}
393
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]394/* Workarounds for IE6's broken and incomplete CSS2. */
395
396div.sidebar-content {
397 background: #ffffee;
398 border: 1px solid silver;
399 padding: 0.5em;
400}
401div.sidebar-title, div.image-title {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]402 color: #527bbd;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]403 font-family: sans-serif;
404 font-weight: bold;
405 margin-top: 0.0em;
406 margin-bottom: 0.5em;
407}
408
409div.listingblock div.content {
410 border: 1px solid silver;
411 background: #f4f4f4;
412 padding: 0.5em;
413}
414
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]415div.quoteblock-attribution {
416 padding-top: 0.5em;
417 text-align: right;
418}
419
420div.verseblock-content {
421 white-space: pre;
422}
423div.verseblock-attribution {
424 padding-top: 0.75em;
425 text-align: left;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]426}
427
428div.exampleblock-content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]429 border-left: 3px solid #dddddd;
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]430 padding-left: 0.5em;
431}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]432
433/* IE6 sets dynamically generated links as visited. */
434div#toc a:visited { color: blue; }
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]435</style>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]436<script type="text/javascript">
437/*<![CDATA[*/
438window.onload = function(){asciidoc.footnotes();}
439var asciidoc = { // Namespace.
440
441/////////////////////////////////////////////////////////////////////
442// Table Of Contents generator
443/////////////////////////////////////////////////////////////////////
444
445/* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
454
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
457
458// toclevels = 1..4.
459toc: function (toclevels) {
460
461 function getText(el) {
462 var text = "";
463 for (var i = el.firstChild; i != null; i = i.nextSibling) {
464 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
465 text += i.data;
466 else if (i.firstChild != null)
467 text += getText(i);
468 }
469 return text;
470 }
471
472 function TocEntry(el, text, toclevel) {
473 this.element = el;
474 this.text = text;
475 this.toclevel = toclevel;
476 }
477
478 function tocEntries(el, toclevels) {
479 var result = new Array;
480 var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
484 var iterate = function (el) {
485 for (var i = el.firstChild; i != null; i = i.nextSibling) {
486 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
487 var mo = re.exec(i.tagName);
488 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
489 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
490 }
491 iterate(i);
492 }
493 }
494 }
495 iterate(el);
496 return result;
497 }
498
499 var toc = document.getElementById("toc");
500 var entries = tocEntries(document.getElementById("content"), toclevels);
501 for (var i = 0; i < entries.length; ++i) {
502 var entry = entries[i];
503 if (entry.element.id == "")
504 entry.element.id = "_toc_" + i;
505 var a = document.createElement("a");
506 a.href = "#" + entry.element.id;
507 a.appendChild(document.createTextNode(entry.text));
508 var div = document.createElement("div");
509 div.appendChild(a);
510 div.className = "toclevel" + entry.toclevel;
511 toc.appendChild(div);
512 }
513 if (entries.length == 0)
514 toc.parentNode.removeChild(toc);
515},
516
517
518/////////////////////////////////////////////////////////////////////
519// Footnotes generator
520/////////////////////////////////////////////////////////////////////
521
522/* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
525
526footnotes: function () {
527 var cont = document.getElementById("content");
528 var noteholder = document.getElementById("footnotes");
529 var spans = cont.getElementsByTagName("span");
530 var refs = {};
531 var n = 0;
532 for (i=0; i<spans.length; i++) {
533 if (spans[i].className == "footnote") {
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
537 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
538 noteholder.innerHTML +=
539 "<div class='footnote' id='_footnote_" + n + "'>" +
540 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
541 n + "</a>. " + note + "</div>";
542 spans[i].innerHTML =
543 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
544 "' title='View footnote' class='footnote'>" + n + "</a>]";
545 var id =spans[i].getAttribute("id");
546 if (id != null) refs["#"+id] = n;
547 }
548 }
549 if (n == 0)
550 noteholder.parentNode.removeChild(noteholder);
551 else {
552 // Process footnoterefs.
553 for (i=0; i<spans.length; i++) {
554 if (spans[i].className == "footnoteref") {
555 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
556 href = href.match(/#.*/)[0]; // Because IE return full URL.
557 n = refs[href];
558 spans[i].innerHTML =
559 "[<a href='#_footnote_" + n +
560 "' title='View footnote' class='footnote'>" + n + "</a>]";
561 }
562 }
563 }
564}
565
566}
567/*]]>*/
568</script>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]569</head>
570<body>
571<div id="header">
572<h1>
573gitcvs-migration(7) Manual Page
574</h1>
575<h2>NAME</h2>
576<div class="sectionbody">
577<p>gitcvs-migration -
578 git for CVS users
579</p>
580</div>
581</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]582<div id="content">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]583<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]584<div class="sectionbody">
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]585<div class="verseblock">
586<div class="verseblock-content"><em>git cvsimport</em> *</div>
587<div class="verseblock-attribution">
588</div></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]589</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]590<h2 id="_description">DESCRIPTION</h2>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]591<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]592<div class="paragraph"><p>Git differs from CVS in that every working tree contains a repository with
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]593a full copy of the project history, and no repository is inherently more
594important than any other. However, you can emulate the CVS model by
595designating a single shared repository which people can synchronize with;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]596this document explains how to do that.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]597<div class="paragraph"><p>Some basic familiarity with git is required. Having gone through
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]598<a href="gittutorial.html">gittutorial(7)</a> and
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]599<a href="gitglossary.html">gitglossary(7)</a> should be sufficient.</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]600</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]601<h2 id="_developing_against_a_shared_repository">Developing against a shared repository</h2>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]602<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]603<div class="paragraph"><p>Suppose a shared repository is set up in /pub/repo.git on the host
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]604foo.com. Then as an individual committer you can clone the shared
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]605repository over ssh with:</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]606<div class="listingblock">
607<div class="content">
608<pre><tt>$ git clone foo.com:/pub/repo.git/ my-project
609$ cd my-project</tt></pre>
610</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]611<div class="paragraph"><p>and hack away. The equivalent of <em>cvs update</em> is</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]612<div class="listingblock">
613<div class="content">
614<pre><tt>$ git pull origin</tt></pre>
615</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]616<div class="paragraph"><p>which merges in any work that others might have done since the clone
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]617operation. If there are uncommitted changes in your working tree, commit
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]618them first before running git pull.</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]619<div class="admonitionblock">
620<table><tr>
621<td class="icon">
622<div class="title">Note</div>
623</td>
624<td class="content">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]625<div class="paragraph"><p>The <em>pull</em> command knows where to get updates from because of certain
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]626configuration variables that were set by the first <em>git clone</em>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]627command; see <tt>git config -l</tt> and the <a href="git-config.html">git-config(1)</a> man
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]628page for details.</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]629</td>
630</tr></table>
631</div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]632<div class="paragraph"><p>You can update the shared repository with your changes by first committing
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]633your changes, and then using the <em>git push</em> command:</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]634<div class="listingblock">
635<div class="content">
636<pre><tt>$ git push origin master</tt></pre>
637</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]638<div class="paragraph"><p>to "push" those commits to the shared repository. If someone else has
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]639updated the repository more recently, <em>git push</em>, like <em>cvs commit</em>, will
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]640complain, in which case you must pull any changes before attempting the
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]641push again.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]642<div class="paragraph"><p>In the <em>git push</em> command above we specify the name of the remote branch
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]643to update (<tt>master</tt>). If we leave that out, <em>git push</em> tries to update
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]644any branches in the remote repository that have the same name as a branch
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]645in the local repository. So the last <em>push</em> can be done with either of:</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]646<div class="listingblock">
647<div class="content">
648<pre><tt>$ git push origin
649$ git push foo.com:/pub/project.git/</tt></pre>
650</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]651<div class="paragraph"><p>as long as the shared repository does not have any branches
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]652other than <tt>master</tt>.</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]653</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]654<h2 id="_setting_up_a_shared_repository">Setting Up a Shared Repository</h2>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]655<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]656<div class="paragraph"><p>We assume you have already created a git repository for your project,
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]657possibly created from scratch or from a tarball (see
658<a href="gittutorial.html">gittutorial(7)</a>), or imported from an already existing CVS
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]659repository (see the next section).</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]660<div class="paragraph"><p>Assume your existing repo is at /home/alice/myproject. Create a new "bare"
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]661repository (a repository without a working tree) and fetch your project into
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]662it:</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]663<div class="listingblock">
664<div class="content">
665<pre><tt>$ mkdir /pub/my-repo.git
666$ cd /pub/my-repo.git
667$ git --bare init --shared
668$ git --bare fetch /home/alice/myproject master:master</tt></pre>
669</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]670<div class="paragraph"><p>Next, give every team member read/write access to this repository. One
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]671easy way to do this is to give all the team members ssh access to the
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]672machine where the repository is hosted. If you don&#8217;t want to give them a
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]673full shell on the machine, there is a restricted shell which only allows
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]674users to do git pushes and pulls; see <a href="git-shell.html">git-shell(1)</a>.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]675<div class="paragraph"><p>Put all the committers in the same group, and make the repository
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]676writable by that group:</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]677<div class="listingblock">
678<div class="content">
679<pre><tt>$ chgrp -R $group /pub/my-repo.git</tt></pre>
680</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]681<div class="paragraph"><p>Make sure committers have a umask of at most 027, so that the directories
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]682they create are writable and searchable by other group members.</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]683</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]684<h2 id="_importing_a_cvs_archive">Importing a CVS archive</h2>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]685<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]686<div class="paragraph"><p>First, install version 2.1 or higher of cvsps from
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]687<a href="http://www.cobite.com/cvsps/">http://www.cobite.com/cvsps/</a> and make
688sure it is in your path. Then cd to a checked out CVS working directory
Junio C Hamanoea868332009-04-21 08:11:06[diff] [blame]689of the project you are interested in and run <a href="git-cvsimport.html">git-cvsimport(1)</a>:</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]690<div class="listingblock">
691<div class="content">
692<pre><tt>$ git cvsimport -C &lt;destination&gt; &lt;module&gt;</tt></pre>
693</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]694<div class="paragraph"><p>This puts a git archive of the named CVS module in the directory
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]695&lt;destination&gt;, which will be created if necessary.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]696<div class="paragraph"><p>The import checks out from CVS every revision of every file. Reportedly
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]697cvsimport can average some twenty revisions per second, so for a
698medium-sized project this should not take more than a couple of minutes.
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]699Larger projects or remote repositories may take longer.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]700<div class="paragraph"><p>The main trunk is stored in the git branch named <tt>origin</tt>, and additional
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]701CVS branches are stored in git branches with the same names. The most
702recent version of the main trunk is also left checked out on the <tt>master</tt>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]703branch, so you can start adding your own changes right away.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]704<div class="paragraph"><p>The import is incremental, so if you call it again next month it will
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]705fetch any CVS updates that have been made in the meantime. For this to
706work, you must not modify the imported branches; instead, create new
707branches for your own changes, and merge in the imported branches as
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]708necessary.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]709<div class="paragraph"><p>If you want a shared repository, you will need to make a bare clone
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]710of the imported directory, as described above. Then treat the imported
711directory as another development clone for purposes of merging
712incremental imports.</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]713</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]714<h2 id="_advanced_shared_repository_management">Advanced Shared Repository Management</h2>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]715<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]716<div class="paragraph"><p>Git allows you to specify scripts called "hooks" to be run at certain
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]717points. You can use these, for example, to send all commits to the shared
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]718repository to a mailing list. See <a href="githooks.html">githooks(5)</a>.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]719<div class="paragraph"><p>You can enforce finer grained permissions using update hooks. See
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]720<a href="howto/update-hook-example.txt">Controlling access to branches using
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]721update hooks</a>.</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]722</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]723<h2 id="_providing_cvs_access_to_a_git_repository">Providing CVS Access to a git Repository</h2>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]724<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]725<div class="paragraph"><p>It is also possible to provide true CVS access to a git repository, so
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]726that developers can still use CVS; see <a href="git-cvsserver.html">git-cvsserver(1)</a> for
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]727details.</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]728</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]729<h2 id="_alternative_development_models">Alternative Development Models</h2>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]730<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]731<div class="paragraph"><p>CVS users are accustomed to giving a group of developers commit access to
732a common repository. As we&#8217;ve seen, this is also possible with git.
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]733However, the distributed nature of git allows other development models,
734and you may want to first consider whether one of them might be a better
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]735fit for your project.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]736<div class="paragraph"><p>For example, you can choose a single person to maintain the project&#8217;s
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]737primary public repository. Other developers then clone this repository
738and each work in their own clone. When they have a series of changes that
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]739they&#8217;re happy with, they ask the maintainer to pull from the branch
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]740containing the changes. The maintainer reviews their changes and pulls
741them into the primary repository, which other developers pull from as
742necessary to stay coordinated. The Linux kernel and other projects use
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]743variants of this model.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]744<div class="paragraph"><p>With a small group, developers may just pull changes from each other&#8217;s
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]745repositories without the need for a central maintainer.</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]746</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]747<h2 id="_see_also">SEE ALSO</h2>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]748<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]749<div class="paragraph"><p><a href="gittutorial.html">gittutorial(7)</a>,
Junio C Hamano9e1793f2008-06-02 07:31:16[diff] [blame]750<a href="gittutorial-2.html">gittutorial-2(7)</a>,
751<a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>,
752<a href="gitglossary.html">gitglossary(7)</a>,
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]753<a href="everyday.html">Everyday Git</a>,
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]754<a href="user-manual.html">The Git User&#8217;s Manual</a></p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]755</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]756<h2 id="_git">GIT</h2>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]757<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]758<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]759</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]760</div>
761<div id="footnotes"><hr /></div>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]762<div id="footer">
763<div id="footer-text">
Junio C Hamano02194af2011-11-17 20:33:59[diff] [blame]764Last updated 2011-11-15 13:45:02 PDT
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]765</div>
766</div>
767</body>
768</html>