| blob | 97ec363f83dbb7ed4af2b96b15483d979630ddda |
4 <head>
9 /* Debug borders */
11 /*
12 border: 1px solid red;
13 */
14 }
16 body {
18 }
20 a {
23 }
26 }
28 em {
31 }
33 strong {
36 }
38 tt {
40 }
48 }
52 }
53 h2 {
55 }
56 h3 {
58 }
59 h3 + * {
61 }
66 }
68 hr {
70 }
72 p {
75 }
79 }
81 pre {
84 }
86 span#author {
91 }
92 span#email {
93 }
96 }
98 div#footer {
104 }
105 div#footer-text {
108 }
109 div#footer-badges {
112 }
114 div#preamble {
117 }
123 }
129 }
133 }
135 /* Block element titles. */
143 }
146 }
150 }
153 }
156 }
162 }
168 }
176 }
181 }
185 }
189 }
190 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
193 }
202 }
206 }
211 }
217 dl {
220 }
221 dt {
226 }
229 }
233 }
236 }
239 }
242 }
245 }
248 }
255 }
259 }
263 }
264 tfoot {
266 }
269 }
272 }
273 /* Because the table frame attribute is overriden by CSS in most browsers. */
276 }
280 }
284 }
290 }
293 }
296 }
302 }
305 }
309 }
313 }
317 }
321 }
326 }
330 }
340 }
345 }
347 div#toc {
349 }
351 div#toctitle {
358 }
363 }
367 }
371 }
375 }
376 /* Workarounds for IE6's broken and incomplete CSS2. */
382 }
389 }
395 }
400 }
404 }
408 }
413 }
415 /* IE6 sets dynamically generated links as visited. */
417 </style>
419 /*<![CDATA[*/
423 /////////////////////////////////////////////////////////////////////
424 // Table Of Contents generator
425 /////////////////////////////////////////////////////////////////////
427 /* Author: Mihai Bazon, September 2002
428 * http://students.infoiasi.ro/~mishoo
429 *
430 * Table Of Content generator
431 * Version: 0.4
432 *
433 * Feel free to use this script under the terms of the GNU General Public
434 * License, as long as you do not remove or alter this notice.
435 */
437 /* modified by Troy D. Hanson, September 2006. License: GPL */
438 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
440 // toclevels = 1..4.
450 }
452 }
458 }
463 // Function that scans the DOM tree for header elements (the DOM2
464 // nodeIterator API would be a better technique but not supported by all
465 // browsers).
472 }
474 }
475 }
476 }
479 }
494 }
497 },
500 /////////////////////////////////////////////////////////////////////
501 // Footnotes generator
502 /////////////////////////////////////////////////////////////////////
504 /* Based on footnote generation code from:
505 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
506 */
516 n++;
517 // Use [\s\S] in place of . so multi-line matches work.
518 // Because JavaScript has no s (dotall) regex flag.
529 }
530 }
534 // Process footnoterefs.
543 }
544 }
545 }
546 }
548 }
549 /*]]>*/
550 </script>
551 </head>
552 <body>
555 </div>
559 <div class="paragraph"><p>There are situations where you want to include contents in your project
560 from an independently developed project. You can just pull from the
561 other project as long as there are no conflicting paths.</p></div>
563 candidates are Makefiles and other standard filenames. You could merge
564 these files but probably you do not want to. A better solution for this
565 problem can be to merge the project as its own subdirectory. This is not
567 <div class="paragraph"><p>What you want is the <em>subtree</em> merge strategy, which helps you in such a
568 situation.</p></div>
569 <div class="paragraph"><p>In this example, let’s say you have the repository at <tt>/path/to/B</tt> (but
572 branch.</p></div>
582 </div></div>
584 <li>
585 <p>
586 name the other project "Bproject", and fetch.
587 </p>
588 </li>
589 <li>
590 <p>
591 prepare for the later step to record the result as a merge.
592 </p>
593 </li>
594 <li>
595 <p>
597 </p>
598 </li>
599 <li>
600 <p>
601 record the merge result.
602 </p>
603 </li>
604 <li>
605 <p>
606 maintain the result with subsequent merges using "subtree"
607 </p>
608 </li>
609 </ol></div>
610 <div class="paragraph"><p>The first four commands are used for the initial merge, while the last
612 </div>
613 </div>
614 <h2 id="_comparing_em_subtree_em_merge_with_submodules">Comparing <em>subtree</em> merge with submodules</h2>
617 <li>
618 <p>
619 The benefit of using subtree merge is that it requires less
620 administrative burden from the users of your repository. It works with
621 older (before Git v1.5.2) clients and you have the code right after
622 clone.
623 </p>
624 </li>
625 <li>
626 <p>
627 However if you use submodules then you can choose not to transfer the
628 submodule objects. This may be a problem with the subtree merge.
629 </p>
630 </li>
631 <li>
632 <p>
633 Also, in case you make changes to the other project, it is easier to
634 submit changes if you just use submodules.
635 </p>
636 </li>
637 </ul></div>
638 </div>
642 <li>
643 <p>
644 If you made changes to the other project in your repository, they may
645 want to merge from your project. This is possible using subtree — it
646 can shift up the paths in your tree and then they can merge only the
647 relevant parts of your tree.
648 </p>
649 </li>
650 <li>
651 <p>
652 Please note that if the other project merges from you, then it will
653 connect its history to yours, which can be something they don’t want
654 to.
655 </p>
656 </li>
657 </ul></div>
658 </div>
659 </div>
664 </div>
665 </div>
666 </body>
667 </html>