Google Git
Sign in
chromium / external / gitster / git-htmldocs / 85c44a9175871f71ce4f18363a471d0eca43fb08 / . / howto-index.html
blob: 7a653aeb58d13ae4bfe5e3fdf022c114cd96cc0e [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[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 Hamano0868a302008-07-22 09:20:44[diff] [blame]6<meta name="generator" content="AsciiDoc 8.2.5" />
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]7<style type="text/css">
8/* Debug borders */
9p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
10/*
11 border: 1px solid red;
12*/
13}
14
15body {
16 margin: 1em 5% 1em 5%;
17}
18
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]19a {
20 color: blue;
21 text-decoration: underline;
22}
23a:visited {
24 color: fuchsia;
25}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]26
27em {
28 font-style: italic;
29}
30
31strong {
32 font-weight: bold;
33}
34
35tt {
36 color: navy;
37}
38
39h1, 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
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]47h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]48 border-bottom: 2px solid silver;
49}
50h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 padding-top: 0.5em;
52}
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]53h3 {
54 float: left;
55}
56h3 + * {
57 clear: left;
58}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]59
60div.sectionbody {
61 font-family: serif;
62 margin-left: 0;
63}
64
65hr {
66 border: 1px solid silver;
67}
68
69p {
70 margin-top: 0.5em;
71 margin-bottom: 0.5em;
72}
73
74pre {
75 padding: 0;
76 margin: 0;
77}
78
79span#author {
80 color: #527bbd;
81 font-family: sans-serif;
82 font-weight: bold;
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]83 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]84}
85span#email {
86}
87span#revision {
88 font-family: sans-serif;
89}
90
91div#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}
98div#footer-text {
99 float: left;
100 padding-bottom: 0.5em;
101}
102div#footer-badges {
103 float: right;
104 padding-bottom: 0.5em;
105}
106
107div#preamble,
108div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
109div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
110div.admonitionblock {
111 margin-right: 10%;
112 margin-top: 1.5em;
113 margin-bottom: 1.5em;
114}
115div.admonitionblock {
116 margin-top: 2.5em;
117 margin-bottom: 2.5em;
118}
119
120div.content { /* Block element content. */
121 padding: 0;
122}
123
124/* Block element titles. */
125div.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}
132div.title + * {
133 margin-top: 0;
134}
135
136td div.title:first-child {
137 margin-top: 0.0em;
138}
139div.content div.title:first-child {
140 margin-top: 0.0em;
141}
142div.content + div.title {
143 margin-top: 0.0em;
144}
145
146div.sidebarblock > div.content {
147 background: #ffffee;
148 border: 1px solid silver;
149 padding: 0.5em;
150}
151
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]152div.listingblock {
153 margin-right: 0%;
154}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]155div.listingblock > div.content {
156 border: 1px solid silver;
157 background: #f4f4f4;
158 padding: 0.5em;
159}
160
161div.quoteblock > div.content {
162 padding-left: 2.0em;
163}
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]164
165div.attribution {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]166 text-align: right;
167}
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]168div.verseblock + div.attribution {
169 text-align: left;
170}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]171
172div.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}
180div.admonitionblock td.content {
181 padding-left: 0.5em;
182 border-left: 2px solid silver;
183}
184
185div.exampleblock > div.content {
186 border-left: 2px solid silver;
187 padding: 0.5em;
188}
189
190div.verseblock div.content {
191 white-space: pre;
192}
193
194div.imageblock div.content { padding-left: 0; }
195div.imageblock img { border: 1px solid silver; }
196span.image img { border-style: none; }
197
198dl {
199 margin-top: 0.8em;
200 margin-bottom: 0.8em;
201}
202dt {
203 margin-top: 0.5em;
204 margin-bottom: 0;
205 font-style: italic;
206}
207dd > *:first-child {
208 margin-top: 0;
209}
210
211ul, ol {
212 list-style-position: outside;
213}
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]214div.olist2 ol {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]215 list-style-type: lower-alpha;
216}
217
218div.tableblock > table {
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]219 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]220}
221thead {
222 font-family: sans-serif;
223 font-weight: bold;
224}
225tfoot {
226 font-weight: bold;
227}
228
229div.hlist {
230 margin-top: 0.8em;
231 margin-bottom: 0.8em;
232}
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]233div.hlist td {
234 padding-bottom: 5px;
235}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]236td.hlist1 {
237 vertical-align: top;
238 font-style: italic;
239 padding-right: 0.8em;
240}
241td.hlist2 {
242 vertical-align: top;
243}
244
245@media print {
246 div#footer-badges { display: none; }
247}
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]248
249div#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
258div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
259 margin-top: 0;
260 margin-bottom: 0;
261}
262div.toclevel2 {
263 margin-left: 2em;
264 font-size: 0.9em;
265}
266div.toclevel3 {
267 margin-left: 4em;
268 font-size: 0.9em;
269}
270div.toclevel4 {
271 margin-left: 6em;
272 font-size: 0.9em;
273}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]274/* Workarounds for IE6's broken and incomplete CSS2. */
275
276div.sidebar-content {
277 background: #ffffee;
278 border: 1px solid silver;
279 padding: 0.5em;
280}
281div.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
288div.listingblock div.content {
289 border: 1px solid silver;
290 background: #f4f4f4;
291 padding: 0.5em;
292}
293
294div.quoteblock-content {
295 padding-left: 2.0em;
296}
297
298div.exampleblock-content {
299 border-left: 2px solid silver;
300 padding-left: 0.5em;
301}
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]302
303/* IE6 sets dynamically generated links as visited. */
304div#toc a:visited { color: blue; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]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">
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]314<div class="para"><p>Here is a collection of mailing list postings made by various
315people describing how they use git in their workflow.</p></div>
316<div class="ilist"><ul>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]317<li>
318<p>
Junio C Hamanoa0970542007-11-23 08:43:30[diff] [blame]319<a href="howto/maintain-git.txt">maintain-git</a> by Junio C Hamano &lt;gitster@pobox.com&gt;
320</p>
321</li>
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]322</ul></div>
323<div class="para"><p>Imagine that git development is racing along as usual, when our friendly
Junio C Hamanoa0970542007-11-23 08:43:30[diff] [blame]324neighborhood maintainer is struck down by a wayward bus. Out of the
325hordes of suckers (loyal developers), you have been tricked (chosen) to
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]326step up as the new maintainer. This howto will show you "how to" do it.</p></div>
327<div class="ilist"><ul>
Junio C Hamanoa0970542007-11-23 08:43:30[diff] [blame]328<li>
329<p>
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]330<a href="howto/rebase-from-internal-branch.txt">rebase-from-internal-branch</a> by Junio C Hamano &lt;gitster@pobox.com&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]331</p>
332</li>
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]333</ul></div>
334<div class="para"><p>In this article, JC talks about how he rebases the
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]335public "pu" branch using the core GIT tools when he updates
336the "master" branch, and how "rebase" works. Also discussed
337is how this applies to individual developers who sends patches
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]338upstream.</p></div>
339<div class="ilist"><ul>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]340<li>
341<p>
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]342<a href="howto/rebuild-from-update-hook.txt">rebuild-from-update-hook</a> by Junio C Hamano &lt;gitster@pobox.com&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]343</p>
344</li>
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]345</ul></div>
346<div class="para"><p>In this how-to article, JC talks about how he
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]347uses the post-update hook to automate git documentation page
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]348shown at http://www.kernel.org/pub/software/scm/git/docs/.</p></div>
349<div class="ilist"><ul>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]350<li>
351<p>
Junio C Hamano18714292007-11-10 11:26:34[diff] [blame]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>
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]355</ul></div>
356<div class="para"><p>Some tricks to reconstruct blob objects in order to fix
357a corrupted repository.</p></div>
358<div class="ilist"><ul>
Junio C Hamano18714292007-11-10 11:26:34[diff] [blame]359<li>
360<p>
Junio C Hamanof62a11d2008-12-21 12:16:36[diff] [blame]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
366is later found to be faulty. Linus and Junio give guidance on
367recovering from such a premature merge and continuing development
368after the offending branch is fixed.</p></div>
369<div class="ilist"><ul>
370<li>
371<p>
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]372<a href="howto/revert-branch-rebase.html">revert-branch-rebase</a> by Junio C Hamano &lt;gitster@pobox.com&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]373</p>
374</li>
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]375</ul></div>
376<div class="para"><p>In this article, JC gives a small real-life example of using
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]377<em>git revert</em> command, and using a temporary branch and tag for safety
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]378and easier sanity checking.</p></div>
379<div class="ilist"><ul>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]380<li>
381<p>
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]382<a href="howto/separating-topic-branches.txt">separating-topic-branches</a> by Junio C Hamano &lt;gitster@pobox.com&gt;
Junio C Hamano63636e52006-02-12 13:31:39[diff] [blame]383</p>
384</li>
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]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>
Junio C Hamano63636e52006-02-12 13:31:39[diff] [blame]388<li>
389<p>
Junio C Hamanoa13b4ee2006-08-11 00:00:23[diff] [blame]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>
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]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;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]396</p>
397</li>
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]398</ul></div>
399<div class="para"><p>An example hooks/update script is presented to
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]400implement repository maintenance policies, such as who can push
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]401into which branch and who can make a tag.</p></div>
402<div class="ilist"><ul>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]403<li>
404<p>
Junio C Hamanod51d9a22007-03-20 09:18:22[diff] [blame]405<a href="howto/use-git-daemon.txt">use-git-daemon</a>
406</p>
407</li>
Junio C Hamano0e47b232008-01-15 08:31:10[diff] [blame]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>
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]413</ul></div>
414<div class="para"><p>In this article, Sean demonstrates how one can use the subtree merge
415strategy.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]416</div>
417</div>
418<div id="footer">
419<div id="footer-text">
Junio C Hamanodca34822010-02-13 01:02:52[diff] [blame]420Last updated 2010-02-13 01:00:12 UTC
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]421</div>
422</div>
423</body>
424</html>