Skip to content
Newer
Older
100644 425 lines (387 sloc) 9.1 KB
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
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" />
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
6 <meta name="generator" content="AsciiDoc 8.2.5" />
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
7 <style type="text/css">
8 /* Debug borders */
9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
10 /*
11 border: 1px solid red;
12 */
13 }
14
15 body {
16 margin: 1em 5% 1em 5%;
17 }
18
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
19 a {
20 color: blue;
21 text-decoration: underline;
22 }
23 a:visited {
24 color: fuchsia;
25 }
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
26
27 em {
28 font-style: italic;
29 }
30
31 strong {
32 font-weight: bold;
33 }
34
35 tt {
36 color: navy;
37 }
38
39 h1, h2, h3, h4, h5, h6 {
40 color: #527bbd;
41 font-family: sans-serif;
42 margin-top: 1.2em;
43 margin-bottom: 0.5em;
44 line-height: 1.3;
45 }
46
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
47 h1, h2, h3 {
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
48 border-bottom: 2px solid silver;
49 }
50 h2 {
51 padding-top: 0.5em;
52 }
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
53 h3 {
54 float: left;
55 }
56 h3 + * {
57 clear: left;
58 }
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
59
60 div.sectionbody {
61 font-family: serif;
62 margin-left: 0;
63 }
64
65 hr {
66 border: 1px solid silver;
67 }
68
69 p {
70 margin-top: 0.5em;
71 margin-bottom: 0.5em;
72 }
73
74 pre {
75 padding: 0;
76 margin: 0;
77 }
78
79 span#author {
80 color: #527bbd;
81 font-family: sans-serif;
82 font-weight: bold;
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
83 font-size: 1.1em;
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
84 }
85 span#email {
86 }
87 span#revision {
88 font-family: sans-serif;
89 }
90
91 div#footer {
92 font-family: sans-serif;
93 font-size: small;
94 border-top: 2px solid silver;
95 padding-top: 0.5em;
96 margin-top: 4.0em;
97 }
98 div#footer-text {
99 float: left;
100 padding-bottom: 0.5em;
101 }
102 div#footer-badges {
103 float: right;
104 padding-bottom: 0.5em;
105 }
106
107 div#preamble,
108 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
109 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
110 div.admonitionblock {
111 margin-right: 10%;
112 margin-top: 1.5em;
113 margin-bottom: 1.5em;
114 }
115 div.admonitionblock {
116 margin-top: 2.5em;
117 margin-bottom: 2.5em;
118 }
119
120 div.content { /* Block element content. */
121 padding: 0;
122 }
123
124 /* Block element titles. */
125 div.title, caption.title {
126 font-family: sans-serif;
127 font-weight: bold;
128 text-align: left;
129 margin-top: 1.0em;
130 margin-bottom: 0.5em;
131 }
132 div.title + * {
133 margin-top: 0;
134 }
135
136 td div.title:first-child {
137 margin-top: 0.0em;
138 }
139 div.content div.title:first-child {
140 margin-top: 0.0em;
141 }
142 div.content + div.title {
143 margin-top: 0.0em;
144 }
145
146 div.sidebarblock > div.content {
147 background: #ffffee;
148 border: 1px solid silver;
149 padding: 0.5em;
150 }
151
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
152 div.listingblock {
153 margin-right: 0%;
154 }
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
155 div.listingblock > div.content {
156 border: 1px solid silver;
157 background: #f4f4f4;
158 padding: 0.5em;
159 }
160
161 div.quoteblock > div.content {
162 padding-left: 2.0em;
163 }
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
164
165 div.attribution {
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
166 text-align: right;
167 }
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
168 div.verseblock + div.attribution {
169 text-align: left;
170 }
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
171
172 div.admonitionblock .icon {
173 vertical-align: top;
174 font-size: 1.1em;
175 font-weight: bold;
176 text-decoration: underline;
177 color: #527bbd;
178 padding-right: 0.5em;
179 }
180 div.admonitionblock td.content {
181 padding-left: 0.5em;
182 border-left: 2px solid silver;
183 }
184
185 div.exampleblock > div.content {
186 border-left: 2px solid silver;
187 padding: 0.5em;
188 }
189
190 div.verseblock div.content {
191 white-space: pre;
192 }
193
194 div.imageblock div.content { padding-left: 0; }
195 div.imageblock img { border: 1px solid silver; }
196 span.image img { border-style: none; }
197
198 dl {
199 margin-top: 0.8em;
200 margin-bottom: 0.8em;
201 }
202 dt {
203 margin-top: 0.5em;
204 margin-bottom: 0;
205 font-style: italic;
206 }
207 dd > *:first-child {
208 margin-top: 0;
209 }
210
211 ul, ol {
212 list-style-position: outside;
213 }
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
214 div.olist2 ol {
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
215 list-style-type: lower-alpha;
216 }
217
218 div.tableblock > table {
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
219 border: 3px solid #527bbd;
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
220 }
221 thead {
222 font-family: sans-serif;
223 font-weight: bold;
224 }
225 tfoot {
226 font-weight: bold;
227 }
228
229 div.hlist {
230 margin-top: 0.8em;
231 margin-bottom: 0.8em;
232 }
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
233 div.hlist td {
234 padding-bottom: 5px;
235 }
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
236 td.hlist1 {
237 vertical-align: top;
238 font-style: italic;
239 padding-right: 0.8em;
240 }
241 td.hlist2 {
242 vertical-align: top;
243 }
244
245 @media print {
246 div#footer-badges { display: none; }
247 }
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
248
249 div#toctitle {
250 color: #527bbd;
251 font-family: sans-serif;
252 font-size: 1.1em;
253 font-weight: bold;
254 margin-top: 1.0em;
255 margin-bottom: 0.1em;
256 }
257
258 div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
259 margin-top: 0;
260 margin-bottom: 0;
261 }
262 div.toclevel2 {
263 margin-left: 2em;
264 font-size: 0.9em;
265 }
266 div.toclevel3 {
267 margin-left: 4em;
268 font-size: 0.9em;
269 }
270 div.toclevel4 {
271 margin-left: 6em;
272 font-size: 0.9em;
273 }
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
274 /* Workarounds for IE6's broken and incomplete CSS2. */
275
276 div.sidebar-content {
277 background: #ffffee;
278 border: 1px solid silver;
279 padding: 0.5em;
280 }
281 div.sidebar-title, div.image-title {
282 font-family: sans-serif;
283 font-weight: bold;
284 margin-top: 0.0em;
285 margin-bottom: 0.5em;
286 }
287
288 div.listingblock div.content {
289 border: 1px solid silver;
290 background: #f4f4f4;
291 padding: 0.5em;
292 }
293
294 div.quoteblock-content {
295 padding-left: 2.0em;
296 }
297
298 div.exampleblock-content {
299 border-left: 2px solid silver;
300 padding-left: 0.5em;
301 }
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
302
303 /* IE6 sets dynamically generated links as visited. */
304 div#toc a:visited { color: blue; }
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
305 </style>
306 <title>GIT Howto Index</title>
307 </head>
308 <body>
309 <div id="header">
310 <h1>GIT Howto Index</h1>
311 </div>
312 <div id="preamble">
313 <div class="sectionbody">
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
314 <div class="para"><p>Here is a collection of mailing list postings made by various
315 people describing how they use git in their workflow.</p></div>
316 <div class="ilist"><ul>
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
317 <li>
318 <p>
a097054 Autogenerated HTML docs for v1.5.3.6-879-gf8111
Junio C Hamano authored Nov 23, 2007
319 <a href="howto/maintain-git.txt">maintain-git</a> by Junio C Hamano &lt;gitster@pobox.com&gt;
320 </p>
321 </li>
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
322 </ul></div>
323 <div class="para"><p>Imagine that git development is racing along as usual, when our friendly
a097054 Autogenerated HTML docs for v1.5.3.6-879-gf8111
Junio C Hamano authored Nov 23, 2007
324 neighborhood maintainer is struck down by a wayward bus. Out of the
325 hordes of suckers (loyal developers), you have been tricked (chosen) to
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
326 step up as the new maintainer. This howto will show you "how to" do it.</p></div>
327 <div class="ilist"><ul>
a097054 Autogenerated HTML docs for v1.5.3.6-879-gf8111
Junio C Hamano authored Nov 23, 2007
328 <li>
329 <p>
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
330 <a href="howto/rebase-from-internal-branch.txt">rebase-from-internal-branch</a> by Junio C Hamano &lt;gitster@pobox.com&gt;
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
331 </p>
332 </li>
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
333 </ul></div>
334 <div class="para"><p>In this article, JC talks about how he rebases the
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
335 public "pu" branch using the core GIT tools when he updates
336 the "master" branch, and how "rebase" works. Also discussed
337 is how this applies to individual developers who sends patches
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
338 upstream.</p></div>
339 <div class="ilist"><ul>
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
340 <li>
341 <p>
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
342 <a href="howto/rebuild-from-update-hook.txt">rebuild-from-update-hook</a> by Junio C Hamano &lt;gitster@pobox.com&gt;
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
343 </p>
344 </li>
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
345 </ul></div>
346 <div class="para"><p>In this how-to article, JC talks about how he
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
347 uses the post-update hook to automate git documentation page
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
348 shown at http://www.kernel.org/pub/software/scm/git/docs/.</p></div>
349 <div class="ilist"><ul>
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
350 <li>
351 <p>
1871429 Autogenerated HTML docs for v1.5.3.5-628-ga1309
Junio C Hamano authored Nov 10, 2007
352 <a href="howto/recover-corrupted-blob-object.txt">recover-corrupted-blob-object</a> by Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
353 </p>
354 </li>
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
355 </ul></div>
356 <div class="para"><p>Some tricks to reconstruct blob objects in order to fix
357 a corrupted repository.</p></div>
358 <div class="ilist"><ul>
1871429 Autogenerated HTML docs for v1.5.3.5-628-ga1309
Junio C Hamano authored Nov 10, 2007
359 <li>
360 <p>
f62a11d Autogenerated HTML docs for v1.6.1-rc3-59-gb3eae
Junio C Hamano authored Dec 21, 2008
361 <a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge</a> by Linus Torvalds &lt;torvalds@linux-foundation.org&gt;, Junio C Hamano &lt;gitster@pobox.com&gt;
362 </p>
363 </li>
364 </ul></div>
365 <div class="para"><p>Sometimes a branch that was already merged to the mainline
366 is later found to be faulty. Linus and Junio give guidance on
367 recovering from such a premature merge and continuing development
368 after the offending branch is fixed.</p></div>
369 <div class="ilist"><ul>
370 <li>
371 <p>
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
372 <a href="howto/revert-branch-rebase.html">revert-branch-rebase</a> by Junio C Hamano &lt;gitster@pobox.com&gt;
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
373 </p>
374 </li>
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
375 </ul></div>
376 <div class="para"><p>In this article, JC gives a small real-life example of using
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
377 <em>git revert</em> command, and using a temporary branch and tag for safety
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
378 and easier sanity checking.</p></div>
379 <div class="ilist"><ul>
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
380 <li>
381 <p>
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
382 <a href="howto/separating-topic-branches.txt">separating-topic-branches</a> by Junio C Hamano &lt;gitster@pobox.com&gt;
63636e5 Autogenerated HTML docs for v1.1.6-g5b766
Junio C Hamano authored Feb 12, 2006
383 </p>
384 </li>
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
385 </ul></div>
386 <div class="para"><p>In this article, JC describes how to separate topic branches.</p></div>
387 <div class="ilist"><ul>
63636e5 Autogenerated HTML docs for v1.1.6-g5b766
Junio C Hamano authored Feb 12, 2006
388 <li>
389 <p>
a13b4ee Autogenerated HTML docs for v1.4.2-rc4-g65cd
Junio C Hamano authored Aug 11, 2006
390 <a href="howto/setup-git-server-over-http.txt">setup-git-server-over-http</a> by Rutger Nijlunsing &lt;rutger@nospam.com&gt;
391 </p>
392 </li>
393 <li>
394 <p>
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
395 <a href="howto/update-hook-example.txt">update-hook-example</a> by Junio C Hamano &lt;gitster@pobox.com&gt; and Carl Baldwin &lt;cnb@fc.hp.com&gt;
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
396 </p>
397 </li>
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
398 </ul></div>
399 <div class="para"><p>An example hooks/update script is presented to
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
400 implement repository maintenance policies, such as who can push
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
401 into which branch and who can make a tag.</p></div>
402 <div class="ilist"><ul>
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
403 <li>
404 <p>
d51d9a2 Autogenerated HTML docs for v1.5.1-rc1-13-g0872
Junio C Hamano authored Mar 20, 2007
405 <a href="howto/use-git-daemon.txt">use-git-daemon</a>
406 </p>
407 </li>
0e47b23 Autogenerated HTML docs for v1.5.4-rc3-11-g4e67
Junio C Hamano authored Jan 15, 2008
408 <li>
409 <p>
410 <a href="howto/using-merge-subtree.html">using-merge-subtree</a> by Sean &lt;seanlkml@sympatico.ca&gt;
411 </p>
412 </li>
0868a30 Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Junio C Hamano authored Jul 22, 2008
413 </ul></div>
414 <div class="para"><p>In this article, Sean demonstrates how one can use the subtree merge
415 strategy.</p></div>
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
416 </div>
417 </div>
418 <div id="footer">
419 <div id="footer-text">
ac752fa Autogenerated HTML docs for v1.7.3
Junio C Hamano authored Sep 19, 2010
420 Last updated 2010-09-18 23:57:16 UTC
1a4e841 Autogenerated HTML docs for 36de72aa9dc3b7daf8cf2770c840f39bb0d2ae70
Junio C Hamano authored Dec 27, 2005
421 </div>
422 </div>
423 </body>
424 </html>
Something went wrong with that request. Please try again.