1 <?xml version=
"1.0" encoding=
"UTF-8"?>
2 <!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.1//EN"
3 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
4 <html xmlns=
"http://www.w3.org/1999/xhtml" xml:
lang=
"en">
6 <meta http-equiv=
"Content-Type" content=
"application/xhtml+xml; charset=UTF-8" />
7 <meta name=
"generator" content=
"AsciiDoc 10.2.0" />
8 <title>Git Howto Index
</title>
9 <style type=
"text/css">
10 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
14 font-family: Georgia,serif;
18 h1, h2, h3, h4, h5, h6,
19 div.title, caption.title,
20 thead, p.table.header,
22 #author, #revnumber, #revdate, #revremark,
24 font-family: Arial,Helvetica,sans-serif;
28 margin:
1em
5%
1em
5%;
33 text-decoration: underline;
49 h1, h2, h3, h4, h5, h6 {
57 border-bottom:
2px solid silver;
77 border:
1px solid silver;
88 ul
> li { color: #aaa; }
89 ul
> li
> * { color: black; }
91 .monospaced, code, pre {
92 font-family:
"Courier New", Courier, monospace;
99 white-space: pre-wrap;
109 #revnumber, #revdate, #revremark {
114 border-top:
2px solid silver;
120 padding-bottom:
0.5em;
124 padding-bottom:
0.5em;
129 margin-bottom:
1.5em;
131 div.imageblock, div.exampleblock, div.verseblock,
132 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
133 div.admonitionblock {
135 margin-bottom:
1.5em;
137 div.admonitionblock {
139 margin-bottom:
2.0em;
144 div.content { /* Block element content. */
148 /* Block element titles. */
149 div.title, caption.title {
154 margin-bottom:
0.5em;
160 td div.title:first-child {
163 div.content div.title:first-child {
166 div.content + div.title {
170 div.sidebarblock
> div.content {
172 border:
1px solid #dddddd;
173 border-left:
4px solid #f0f0f0;
177 div.listingblock
> div.content {
178 border:
1px solid #dddddd;
179 border-left:
5px solid #f0f0f0;
184 div.quoteblock, div.verseblock {
188 border-left:
5px solid #f0f0f0;
192 div.quoteblock
> div.attribution {
197 div.verseblock
> pre.content {
198 font-family: inherit;
201 div.verseblock
> div.attribution {
205 /* DEPRECATED: Pre version
8.2.7 verse style literal block. */
206 div.verseblock + div.attribution {
210 div.admonitionblock .icon {
214 text-decoration: underline;
216 padding-right:
0.5em;
218 div.admonitionblock td.content {
220 border-left:
3px solid #dddddd;
223 div.exampleblock
> div.content {
224 border-left:
3px solid #dddddd;
228 div.imageblock div.content { padding-left:
0; }
229 span.image img { border-style: none; vertical-align: text-bottom; }
230 a.image:visited { color: white; }
234 margin-bottom:
0.8em;
247 list-style-position: outside;
250 list-style-type: decimal;
253 list-style-type: lower-alpha;
256 list-style-type: upper-alpha;
259 list-style-type: lower-roman;
262 list-style-type: upper-roman;
265 div.compact ul, div.compact ol,
266 div.compact p, div.compact p,
267 div.compact div, div.compact div {
269 margin-bottom:
0.1em;
281 margin-bottom:
0.8em;
284 padding-bottom:
15px;
286 dt.hdlist1.strong, td.hdlist1.strong {
292 padding-right:
0.8em;
298 div.hdlist.compact tr {
307 .footnote, .footnoteref {
311 span.footnote, span.footnoteref {
312 vertical-align: super;
316 margin:
20px
0 20px
0;
320 #footnotes div.footnote {
326 border-top:
1px solid silver;
335 padding-right:
0.5em;
336 padding-bottom:
0.3em;
344 #footer-badges { display: none; }
348 margin-bottom:
2.5em;
356 margin-bottom:
0.1em;
359 div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
376 span.aqua { color: aqua; }
377 span.black { color: black; }
378 span.blue { color: blue; }
379 span.fuchsia { color: fuchsia; }
380 span.gray { color: gray; }
381 span.green { color: green; }
382 span.lime { color: lime; }
383 span.maroon { color: maroon; }
384 span.navy { color: navy; }
385 span.olive { color: olive; }
386 span.purple { color: purple; }
387 span.red { color: red; }
388 span.silver { color: silver; }
389 span.teal { color: teal; }
390 span.white { color: white; }
391 span.yellow { color: yellow; }
393 span.aqua-background { background: aqua; }
394 span.black-background { background: black; }
395 span.blue-background { background: blue; }
396 span.fuchsia-background { background: fuchsia; }
397 span.gray-background { background: gray; }
398 span.green-background { background: green; }
399 span.lime-background { background: lime; }
400 span.maroon-background { background: maroon; }
401 span.navy-background { background: navy; }
402 span.olive-background { background: olive; }
403 span.purple-background { background: purple; }
404 span.red-background { background: red; }
405 span.silver-background { background: silver; }
406 span.teal-background { background: teal; }
407 span.white-background { background: white; }
408 span.yellow-background { background: yellow; }
410 span.big { font-size:
2em; }
411 span.small { font-size:
0.6em; }
413 span.underline { text-decoration: underline; }
414 span.overline { text-decoration: overline; }
415 span.line-through { text-decoration: line-through; }
417 div.unbreakable { page-break-inside: avoid; }
427 margin-bottom:
1.5em;
429 div.tableblock
> table {
430 border:
3px solid #
527bbd;
432 thead, p.table.header {
439 /* Because the table frame attribute is overridden by CSS in most browsers. */
440 div.tableblock
> table[
frame=
"void"] {
443 div.tableblock
> table[
frame=
"hsides"] {
444 border-left-style: none;
445 border-right-style: none;
447 div.tableblock
> table[
frame=
"vsides"] {
448 border-top-style: none;
449 border-bottom-style: none;
460 margin-bottom:
1.5em;
462 thead, p.tableblock.header {
473 border-color: #
527bbd;
474 border-collapse: collapse;
476 th.tableblock, td.tableblock {
480 border-color: #
527bbd;
483 table.tableblock.frame-topbot {
484 border-left-style: hidden;
485 border-right-style: hidden;
487 table.tableblock.frame-sides {
488 border-top-style: hidden;
489 border-bottom-style: hidden;
491 table.tableblock.frame-none {
492 border-style: hidden;
495 th.tableblock.halign-left, td.tableblock.halign-left {
498 th.tableblock.halign-center, td.tableblock.halign-center {
501 th.tableblock.halign-right, td.tableblock.halign-right {
505 th.tableblock.valign-top, td.tableblock.valign-top {
508 th.tableblock.valign-middle, td.tableblock.valign-middle {
509 vertical-align: middle;
511 th.tableblock.valign-bottom, td.tableblock.valign-bottom {
512 vertical-align: bottom;
523 padding-bottom:
0.5em;
524 border-top:
2px solid silver;
525 border-bottom:
2px solid silver;
530 body.manpage div.sectionbody {
535 body.manpage div#toc { display: none; }
540 <script type=
"text/javascript">
542 var asciidoc = { // Namespace.
544 /////////////////////////////////////////////////////////////////////
545 // Table Of Contents generator
546 /////////////////////////////////////////////////////////////////////
548 /* Author: Mihai Bazon, September
2002
549 * http://students.infoiasi.ro/~mishoo
551 * Table Of Content generator
554 * Feel free to use this script under the terms of the GNU General Public
555 * License, as long as you do not remove or alter this notice.
558 /* modified by Troy D. Hanson, September
2006. License: GPL */
559 /* modified by Stuart Rackham,
2006,
2009. License: GPL */
562 toc: function (toclevels) {
564 function getText(el) {
566 for (var i = el.firstChild; i != null; i = i.nextSibling) {
567 if (i.nodeType ==
3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
569 else if (i.firstChild != null)
575 function TocEntry(el, text, toclevel) {
578 this.toclevel = toclevel;
581 function tocEntries(el, toclevels) {
582 var result = new Array;
583 var re = new RegExp('[hH]([
1-'+(toclevels+
1)+'])');
584 // Function that scans the DOM tree for header elements (the DOM2
585 // nodeIterator API would be a better technique but not supported by all
587 var iterate = function (el) {
588 for (var i = el.firstChild; i != null; i = i.nextSibling) {
589 if (i.nodeType ==
1 /* Node.ELEMENT_NODE */) {
590 var mo = re.exec(i.tagName);
591 if (mo && (i.getAttribute(
"class") || i.getAttribute(
"className")) !=
"float") {
592 result[result.length] = new TocEntry(i, getText(i), mo[
1]-
1);
602 var toc = document.getElementById(
"toc");
607 // Delete existing TOC entries in case we're reloading the TOC.
608 var tocEntriesToRemove = [];
610 for (i =
0; i < toc.childNodes.length; i++) {
611 var entry = toc.childNodes[i];
612 if (entry.nodeName.toLowerCase() == 'div'
613 && entry.getAttribute(
"class")
614 && entry.getAttribute(
"class").match(/^toclevel/))
615 tocEntriesToRemove.push(entry);
617 for (i =
0; i < tocEntriesToRemove.length; i++) {
618 toc.removeChild(tocEntriesToRemove[i]);
621 // Rebuild TOC entries.
622 var entries = tocEntries(document.getElementById(
"content"), toclevels);
623 for (var i =
0; i < entries.length; ++i) {
624 var entry = entries[i];
625 if (entry.element.id ==
"")
626 entry.element.id =
"_toc_" + i;
627 var a = document.createElement(
"a");
628 a.href =
"#" + entry.element.id;
629 a.appendChild(document.createTextNode(entry.text));
630 var div = document.createElement(
"div");
632 div.className =
"toclevel" + entry.toclevel;
633 toc.appendChild(div);
635 if (entries.length ==
0)
636 toc.parentNode.removeChild(toc);
640 /////////////////////////////////////////////////////////////////////
641 // Footnotes generator
642 /////////////////////////////////////////////////////////////////////
644 /* Based on footnote generation code from:
645 * http://www.brandspankingnew.net/archive/
2005/
07/format_footnote.html
648 footnotes: function () {
649 // Delete existing footnote entries in case we're reloading the footnodes.
651 var noteholder = document.getElementById(
"footnotes");
655 var entriesToRemove = [];
656 for (i =
0; i < noteholder.childNodes.length; i++) {
657 var entry = noteholder.childNodes[i];
658 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute(
"class") ==
"footnote")
659 entriesToRemove.push(entry);
661 for (i =
0; i < entriesToRemove.length; i++) {
662 noteholder.removeChild(entriesToRemove[i]);
665 // Rebuild footnote entries.
666 var cont = document.getElementById(
"content");
667 var spans = cont.getElementsByTagName(
"span");
670 for (i=
0; i
<spans.length; i++) {
671 if (spans[i].className ==
"footnote") {
673 var note = spans[i].getAttribute(
"data-note");
675 // Use [\s\S] in place of . so multi-line matches work.
676 // Because JavaScript has no s (dotall) regex flag.
677 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[
1];
679 "[<a id='_footnoteref_" + n +
"' href='#_footnote_" + n +
680 "' title='View footnote' class='footnote'>" + n +
"</a>]";
681 spans[i].setAttribute(
"data-note", note);
683 noteholder.innerHTML +=
684 "<div class='footnote' id='_footnote_" + n +
"'>" +
685 "<a href='#_footnoteref_" + n +
"' title='Return to text'>" +
686 n +
"</a>. " + note +
"</div>";
687 var id =spans[i].getAttribute(
"id");
688 if (id != null) refs[
"#"+id] = n;
692 noteholder.parentNode.removeChild(noteholder);
694 // Process footnoterefs.
695 for (i=
0; i
<spans.length; i++) {
696 if (spans[i].className ==
"footnoteref") {
697 var href = spans[i].getElementsByTagName(
"a")[
0].getAttribute(
"href");
698 href = href.match(/#.*/)[
0]; // Because IE return full URL.
701 "[<a href='#_footnote_" + n +
702 "' title='View footnote' class='footnote'>" + n +
"</a>]";
708 install: function(toclevels) {
711 function reinstall() {
712 asciidoc.footnotes();
714 asciidoc.toc(toclevels);
718 function reinstallAndRemoveTimer() {
719 clearInterval(timerId);
723 timerId = setInterval(reinstall,
500);
724 if (document.addEventListener)
725 document.addEventListener(
"DOMContentLoaded", reinstallAndRemoveTimer, false);
727 window.onload = reinstallAndRemoveTimer;
735 <body class=
"article">
737 <h1>Git Howto Index
</h1>
741 <div class=
"sectionbody">
742 <div class=
"paragraph"><p>Here is a collection of mailing list postings made by various
743 people describing how they use Git in their workflow.
</p></div>
744 <div class=
"ulist"><ul>
747 <a href=
"howto/coordinate-embargoed-releases.html">coordinate-embargoed-releases
</a>
751 <div class=
"paragraph"><p>When a critical vulnerability is discovered and fixed, we follow this
752 script to coordinate a public release.
</p></div>
753 <div class=
"ulist"><ul>
756 <a href=
"howto/keep-canonical-history-correct.html">keep-canonical-history-correct
</a> by Junio C Hamano
<<a href=
"mailto:gitster@pobox.com">gitster@pobox.com
</a>>
760 <div class=
"paragraph"><p>This how-to explains a method for keeping a
761 project
’s history correct when using git pull.
</p></div>
762 <div class=
"ulist"><ul>
765 <a href=
"howto/maintain-git.html">maintain-git
</a> by Junio C Hamano
<<a href=
"mailto:gitster@pobox.com">gitster@pobox.com
</a>>
769 <div class=
"paragraph"><p>Imagine that Git development is racing along as usual, when our friendly
770 neighborhood maintainer is struck down by a wayward bus. Out of the
771 hordes of suckers (loyal developers), you have been tricked (chosen) to
772 step up as the new maintainer. This howto will show you
"how to" do it.
</p></div>
773 <div class=
"ulist"><ul>
776 <a href=
"howto/new-command.html">new-command
</a> by Eric S. Raymond
<<a href=
"mailto:esr@thyrsus.com">esr@thyrsus.com
</a>>
780 <div class=
"paragraph"><p>This is how-to documentation for people who want to add extension
781 commands to Git. It should be read alongside api-builtin.txt.
</p></div>
782 <div class=
"ulist"><ul>
785 <a href=
"howto/rebase-from-internal-branch.html">rebase-from-internal-branch
</a> by Junio C Hamano
<<a href=
"mailto:gitster@pobox.com">gitster@pobox.com
</a>>
789 <div class=
"paragraph"><p>In this article, JC talks about how he rebases the
790 public
"seen" branch using the core Git tools when he updates
791 the
"master" branch, and how
"rebase" works. Also discussed
792 is how this applies to individual developers who sends patches
794 <div class=
"ulist"><ul>
797 <a href=
"howto/rebuild-from-update-hook.html">rebuild-from-update-hook
</a> by Junio C Hamano
<<a href=
"mailto:gitster@pobox.com">gitster@pobox.com
</a>>
801 <div class=
"paragraph"><p>In this how-to article, JC talks about how he
802 uses the post-update hook to automate Git documentation page
803 shown at
<a href=
"https://www.kernel.org/pub/software/scm/git/docs/">https://www.kernel.org/pub/software/scm/git/docs/
</a>.
</p></div>
804 <div class=
"ulist"><ul>
807 <a href=
"howto/recover-corrupted-blob-object.html">recover-corrupted-blob-object
</a> by Linus Torvalds
<<a href=
"mailto:torvalds@linux-foundation.org">torvalds@linux-foundation.org
</a>>
811 <div class=
"paragraph"><p>Some tricks to reconstruct blob objects in order to fix
812 a corrupted repository.
</p></div>
813 <div class=
"ulist"><ul>
816 <a href=
"howto/recover-corrupted-object-harder.html">recover-corrupted-object-harder
</a> by Jeff King
<<a href=
"mailto:peff@peff.net">peff@peff.net
</a>>
820 <div class=
"paragraph"><p>Recovering a corrupted object when no good copy is available.
</p></div>
821 <div class=
"ulist"><ul>
824 <a href=
"howto/revert-a-faulty-merge.html">revert-a-faulty-merge
</a> by Linus Torvalds
<<a href=
"mailto:torvalds@linux-foundation.org">torvalds@linux-foundation.org
</a>>, Junio C Hamano
<<a href=
"mailto:gitster@pobox.com">gitster@pobox.com
</a>>
828 <div class=
"paragraph"><p>Sometimes a branch that was already merged to the mainline
829 is later found to be faulty. Linus and Junio give guidance on
830 recovering from such a premature merge and continuing development
831 after the offending branch is fixed.
</p></div>
832 <div class=
"ulist"><ul>
835 <a href=
"howto/revert-branch-rebase.html">revert-branch-rebase
</a> by Junio C Hamano
<<a href=
"mailto:gitster@pobox.com">gitster@pobox.com
</a>>
839 <div class=
"paragraph"><p>In this article, JC gives a small real-life example of using
840 <em>git revert
</em> command, and using a temporary branch and tag for safety
841 and easier sanity checking.
</p></div>
842 <div class=
"ulist"><ul>
845 <a href=
"howto/separating-topic-branches.html">separating-topic-branches
</a> by Junio C Hamano
<<a href=
"mailto:gitster@pobox.com">gitster@pobox.com
</a>>
849 <div class=
"paragraph"><p>In this article, JC describes how to separate topic branches.
</p></div>
850 <div class=
"ulist"><ul>
853 <a href=
"howto/setup-git-server-over-http.html">setup-git-server-over-http
</a> by Rutger Nijlunsing
<<a href=
"mailto:rutger@nospam.com">rutger@nospam.com
</a>>
858 <a href=
"howto/update-hook-example.html">update-hook-example
</a> by Junio C Hamano
<<a href=
"mailto:gitster@pobox.com">gitster@pobox.com
</a>> and Carl Baldwin
<<a href=
"mailto:cnb@fc.hp.com">cnb@fc.hp.com
</a>>
862 <div class=
"paragraph"><p>An example hooks/update script is presented to
863 implement repository maintenance policies, such as who can push
864 into which branch and who can make a tag.
</p></div>
865 <div class=
"ulist"><ul>
868 <a href=
"howto/use-git-daemon.html">use-git-daemon
</a>
873 <a href=
"howto/using-merge-subtree.html">using-merge-subtree
</a> by Sean
<<a href=
"mailto:seanlkml@sympatico.ca">seanlkml@sympatico.ca
</a>>
877 <div class=
"paragraph"><p>In this article, Sean demonstrates how one can use the subtree merge
879 <div class=
"ulist"><ul>
882 <a href=
"howto/using-signed-tag-in-pull-request.html">using-signed-tag-in-pull-request
</a> by Junio C Hamano
<<a href=
"mailto:gitster@pobox.com">gitster@pobox.com
</a>>
886 <div class=
"paragraph"><p>Beginning v1.7
.9, a contributor can push a signed tag to her
887 publishing repository and ask her integrator to pull it. This assures the
888 integrator that the pulled history is authentic and allows others to
889 later validate it.
</p></div>
893 <div id=
"footnotes"><hr /></div>
895 <div id=
"footer-text">
897 2022-
10-
03 09:
55:
14 PDT