Google Git
Sign in
chromium / external / gitster / git-htmldocs / 67cc20ae85b65c4b295bf2fac6b54ebdb9aef8bf / . / git-commit-tree.html
blob: 3c4ab2cfcf547da0166281e04b4e475537bdc13c [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 Hamano7bd050f2011-09-22 06:32:22[diff] [blame]6<meta name="generator" content="AsciiDoc 8.5.2" />
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]7<title>git-commit-tree(1)</title>
Junio C Hamano1a4e8412005-12-27 08:17:23[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 Hamano1a4e8412005-12-27 08:17:23[diff] [blame]27
28em {
29 font-style: italic;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]30 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]31}
32
33strong {
34 font-weight: bold;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]35 color: #083194;
Junio C Hamano1a4e8412005-12-27 08:17:23[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 Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 border-bottom: 2px solid silver;
52}
53h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[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 Hamano1a4e8412005-12-27 08:17:23[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 Hamano68cf15a2010-11-06 01:01:59[diff] [blame]77ul, ol, li > p {
78 margin-top: 0;
79}
80
Junio C Hamano1a4e8412005-12-27 08:17:23[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 Hamano1a4e8412005-12-27 08:17:23[diff] [blame]91}
92span#email {
93}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]94span#revnumber, span#revdate, span#revremark {
Junio C Hamano1a4e8412005-12-27 08:17:23[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 Hamano68cf15a2010-11-06 01:01:59[diff] [blame]114div#preamble {
115 margin-top: 1.5em;
116 margin-bottom: 1.5em;
117}
Junio C Hamano1a4e8412005-12-27 08:17:23[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 Hamano1a4e8412005-12-27 08:17:23[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 Hamano1a4e8412005-12-27 08:17:23[diff] [blame]129}
130
131div.content { /* Block element content. */
132 padding: 0;
133}
134
135/* Block element titles. */
136div.title, caption.title {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]137 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[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 Hamano68cf15a2010-11-06 01:01:59[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 Hamano1a4e8412005-12-27 08:17:23[diff] [blame]176}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]177
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]178div.quoteblock > div.attribution {
179 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]180 text-align: right;
181}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]182
Junio C Hamano68cf15a2010-11-06 01:01:59[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 Hamano1a4e8412005-12-27 08:17:23[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 Hamano1a4e8412005-12-27 08:17:23[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 Hamano1a4e8412005-12-27 08:17:23[diff] [blame]211}
212
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]213div.imageblock div.content { padding-left: 0; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]214span.image img { border-style: none; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]215a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23[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 Hamano68cf15a2010-11-06 01:01:59[diff] [blame]224 font-style: normal;
225 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]226}
227dd > *:first-child {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]228 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]229}
230
231ul, ol {
232 list-style-position: outside;
233}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]234ol.arabic {
235 list-style-type: decimal;
236}
237ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]238 list-style-type: lower-alpha;
239}
Junio C Hamano68cf15a2010-11-06 01:01:59[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 Hamano1a4e8412005-12-27 08:17:23[diff] [blame]256
257div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]258 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]259}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]260thead, p.table.header {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]261 font-family: sans-serif;
262 font-weight: bold;
263}
264tfoot {
265 font-weight: bold;
266}
Junio C Hamano68cf15a2010-11-06 01:01:59[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 Hamano1a4e8412005-12-27 08:17:23[diff] [blame]285
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]286
287div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]288 margin-top: 0.8em;
289 margin-bottom: 0.8em;
290}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]291div.hdlist tr {
292 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]293}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]294dt.hdlist1.strong, td.hdlist1.strong {
295 font-weight: bold;
296}
297td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]298 vertical-align: top;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]299 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]300 padding-right: 0.8em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]301 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]302}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]303td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]304 vertical-align: top;
305}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]306div.hdlist.compact tr {
307 margin: 0;
308 padding-bottom: 0;
309}
310
311.comment {
312 background: yellow;
313}
Junio C Hamano1a4e8412005-12-27 08:17:23[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 Hamano1a4e8412005-12-27 08:17:23[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 Hamano68cf15a2010-11-06 01:01:59[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 Hamano1a4e8412005-12-27 08:17:23[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 Hamano68cf15a2010-11-06 01:01:59[diff] [blame]402 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[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 Hamano68cf15a2010-11-06 01:01:59[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 Hamano1a4e8412005-12-27 08:17:23[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 Hamano1a4e8412005-12-27 08:17:23[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 Hamano1a4e8412005-12-27 08:17:23[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 Hamano1a4e8412005-12-27 08:17:23[diff] [blame]569</head>
570<body>
571<div id="header">
572<h1>
573git-commit-tree(1) Manual Page
574</h1>
575<h2>NAME</h2>
576<div class="sectionbody">
577<p>git-commit-tree -
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]578 Create a new commit object
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]579</p>
580</div>
581</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]582<div id="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]583<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]584<div class="sectionbody">
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]585<div class="verseblock">
Junio C Hamano515ab1d2011-12-09 23:41:20[diff] [blame]586<div class="verseblock-content"><em>git commit-tree</em> &lt;tree&gt; [(-p &lt;parent&gt;)&#8230;] &lt; changelog
587<em>git commit-tree</em> [(-p &lt;parent&gt;)&#8230;] [(-m &lt;message&gt;)&#8230;] [(-F &lt;file&gt;)&#8230;] &lt;tree&gt;</div>
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]588<div class="verseblock-attribution">
589</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]590</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]591<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]592<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]593<div class="paragraph"><p>This is usually not what an end user wants to run directly. See
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]594<a href="git-commit.html">git-commit(1)</a> instead.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]595<div class="paragraph"><p>Creates a new commit object based on the provided tree object and
Junio C Hamano515ab1d2011-12-09 23:41:20[diff] [blame]596emits the new commit object id on stdout. The log message is read
597from the standard input, unless <tt>-m</tt> or <tt>-F</tt> options are given.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]598<div class="paragraph"><p>A commit object may have any number of parents. With exactly one
Junio C Hamanofaa1e502008-08-10 03:55:58[diff] [blame]599parent, it is an ordinary commit. Having more than one parent makes
600the commit a merge between several lines of history. Initial (root)
601commits have no parents.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]602<div class="paragraph"><p>While a tree represents a particular directory state of a working
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]603directory, a commit represents that state in "time", and explains how
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]604to get there.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]605<div class="paragraph"><p>Normally a commit would identify a new "HEAD" state, and while git
606doesn&#8217;t care where you save the note about that state, in practice we
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]607tend to just write the result to the file that is pointed at by
608<tt>.git/HEAD</tt>, so that we can always see what the last committed
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]609state was.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]610</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]611<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]612<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]613<div class="dlist"><dl>
614<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]615&lt;tree&gt;
616</dt>
617<dd>
618<p>
619 An existing tree object
620</p>
621</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]622<dt class="hdlist1">
Junio C Hamano515ab1d2011-12-09 23:41:20[diff] [blame]623-p &lt;parent&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]624</dt>
625<dd>
626<p>
627 Each <em>-p</em> indicates the id of a parent commit object.
628</p>
629</dd>
Junio C Hamano515ab1d2011-12-09 23:41:20[diff] [blame]630<dt class="hdlist1">
631-m &lt;message&gt;
632</dt>
633<dd>
634<p>
635 A paragraph in the commig log message. This can be given more than
636 once and each &lt;message&gt; becomes its own paragraph.
637</p>
638</dd>
639<dt class="hdlist1">
640-F &lt;file&gt;
641</dt>
642<dd>
643<p>
644 Read the commit log message from the given file. Use <tt>-</tt> to read
645 from the standard input.
646</p>
647</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]648</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]649</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]650<h2 id="_commit_information">Commit Information</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]651<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]652<div class="paragraph"><p>A commit encapsulates:</p></div>
653<div class="ulist"><ul>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]654<li>
655<p>
656all parent object ids
657</p>
658</li>
659<li>
660<p>
661author name, email and date
662</p>
663</li>
664<li>
665<p>
666committer name and email and the commit time.
667</p>
668</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]669</ul></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]670<div class="paragraph"><p>While parent object ids are provided on the command line, author and
Junio C Hamanoa6387422007-08-25 03:54:27[diff] [blame]671committer information is taken from the following environment variables,
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]672if set:</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]673<div class="literalblock">
674<div class="content">
675<pre><tt>GIT_AUTHOR_NAME
676GIT_AUTHOR_EMAIL
677GIT_AUTHOR_DATE
678GIT_COMMITTER_NAME
Junio C Hamano469d60e2007-04-29 18:30:34[diff] [blame]679GIT_COMMITTER_EMAIL
680GIT_COMMITTER_DATE
681EMAIL</tt></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]682</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]683<div class="paragraph"><p>(nb "&lt;", "&gt;" and "\n"s are stripped)</p></div>
684<div class="paragraph"><p>In case (some of) these environment variables are not set, the information
Junio C Hamano1b11dcb2007-08-18 07:20:55[diff] [blame]685is taken from the configuration items user.name and user.email, or, if not
Junio C Hamano5a73f302011-10-14 05:58:34[diff] [blame]686present, system user name and the hostname used for outgoing mail (taken
687from <tt>/etc/mailname</tt> and falling back to the fully qualified hostname when
688that file does not exist).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]689<div class="paragraph"><p>A commit comment is read from stdin. If a changelog
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]690entry is not provided via "&lt;" redirection, <em>git commit-tree</em> will just wait
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]691for one to be entered and terminated with ^D.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]692</div>
Junio C Hamanoae05fee2010-01-08 07:39:46[diff] [blame]693<h2 id="_date_formats">DATE FORMATS</h2>
694<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]695<div class="paragraph"><p>The GIT_AUTHOR_DATE, GIT_COMMITTER_DATE environment variables
Junio C Hamanoae05fee2010-01-08 07:39:46[diff] [blame]696support the following date formats:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]697<div class="dlist"><dl>
698<dt class="hdlist1">
Junio C Hamanoae05fee2010-01-08 07:39:46[diff] [blame]699Git internal format
700</dt>
701<dd>
702<p>
703 It is <tt>&lt;unix timestamp&gt; &lt;timezone offset&gt;</tt>, where <tt>&lt;unix
704 timestamp&gt;</tt> is the number of seconds since the UNIX epoch.
705 <tt>&lt;timezone offset&gt;</tt> is a positive or negative offset from UTC.
706 For example CET (which is 2 hours ahead UTC) is <tt>+0200</tt>.
707</p>
708</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]709<dt class="hdlist1">
Junio C Hamanoae05fee2010-01-08 07:39:46[diff] [blame]710RFC 2822
711</dt>
712<dd>
713<p>
714 The standard email format as described by RFC 2822, for example
715 <tt>Thu, 07 Apr 2005 22:13:13 +0200</tt>.
716</p>
717</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]718<dt class="hdlist1">
Junio C Hamanoae05fee2010-01-08 07:39:46[diff] [blame]719ISO 8601
720</dt>
721<dd>
722<p>
723 Time and date specified by the ISO 8601 standard, for example
724 <tt>2005-04-07T22:13:13</tt>. The parser accepts a space instead of the
725 <tt>T</tt> character as well.
726</p>
727<div class="admonitionblock">
728<table><tr>
729<td class="icon">
730<div class="title">Note</div>
731</td>
732<td class="content">In addition, the date part is accepted in the following formats:
733<tt>YYYY.MM.DD</tt>, <tt>MM/DD/YYYY</tt> and <tt>DD.MM.YYYY</tt>.</td>
734</tr></table>
735</div>
736</dd>
737</dl></div>
738</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]739<h2 id="_diagnostics">Diagnostics</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]740<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]741<div class="dlist"><dl>
742<dt class="hdlist1">
743You don&#8217;t exist. Go away!
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]744</dt>
745<dd>
746<p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]747 The passwd(5) gecos field couldn&#8217;t be read
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]748</p>
749</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]750<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]751Your parents must have hated you!
752</dt>
753<dd>
754<p>
Junio C Hamano37276192008-09-04 00:24:07[diff] [blame]755 The passwd(5) gecos field is longer than a giant static buffer.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]756</p>
757</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]758<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]759Your sysadmin must hate you!
760</dt>
761<dd>
762<p>
Junio C Hamano37276192008-09-04 00:24:07[diff] [blame]763 The passwd(5) name field is longer than a giant static buffer.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]764</p>
765</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]766</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]767</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]768<h2 id="_discussion">Discussion</h2>
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]769<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]770<div class="paragraph"><p>At the core level, git is character encoding agnostic.</p></div>
771<div class="ulist"><ul>
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]772<li>
773<p>
774The pathnames recorded in the index and in the tree objects
775 are treated as uninterpreted sequences of non-NUL bytes.
776 What readdir(2) returns are what are recorded and compared
777 with the data git keeps track of, which in turn are expected
778 to be what lstat(2) and creat(2) accepts. There is no such
779 thing as pathname encoding translation.
780</p>
781</li>
782<li>
783<p>
Junio C Hamano54bf1e22008-12-20 06:30:11[diff] [blame]784The contents of the blob objects are uninterpreted sequences
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]785 of bytes. There is no encoding translation at the core
786 level.
787</p>
788</li>
789<li>
790<p>
Junio C Hamano54bf1e22008-12-20 06:30:11[diff] [blame]791The commit log messages are uninterpreted sequences of non-NUL
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]792 bytes.
793</p>
794</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]795</ul></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]796<div class="paragraph"><p>Although we encourage that the commit log messages are encoded
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]797in UTF-8, both the core and git Porcelain are designed not to
798force UTF-8 on projects. If all participants of a particular
799project find it more convenient to use legacy encodings, git
800does not forbid it. However, there are a few things to keep in
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]801mind.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]802<div class="olist arabic"><ol class="arabic">
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]803<li>
804<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]805<em>git commit</em> and <em>git commit-tree</em> issues
Junio C Hamano14b76482008-01-05 10:32:26[diff] [blame]806 a warning if the commit log message given to it does not look
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]807 like a valid UTF-8 string, unless you explicitly say your
808 project uses a legacy encoding. The way to say this is to
Junio C Hamano35bb3f62007-02-19 05:35:53[diff] [blame]809 have i18n.commitencoding in <tt>.git/config</tt> file, like this:
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]810</p>
811<div class="listingblock">
812<div class="content">
Junio C Hamano35bb3f62007-02-19 05:35:53[diff] [blame]813<pre><tt>[i18n]
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]814 commitencoding = ISO-8859-1</tt></pre>
815</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]816<div class="paragraph"><p>Commit objects created with the above setting record the value
Junio C Hamano35bb3f62007-02-19 05:35:53[diff] [blame]817of <tt>i18n.commitencoding</tt> in its <tt>encoding</tt> header. This is to
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]818help other people who look at them later. Lack of this header
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]819implies that the commit log message is encoded in UTF-8.</p></div>
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]820</li>
821<li>
822<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]823<em>git log</em>, <em>git show</em>, <em>git blame</em> and friends look at the
Junio C Hamanoaa17c7c2008-11-03 04:36:58[diff] [blame]824 <tt>encoding</tt> header of a commit object, and try to re-code the
825 log message into UTF-8 unless otherwise specified. You can
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]826 specify the desired output encoding with
Junio C Hamano35bb3f62007-02-19 05:35:53[diff] [blame]827 <tt>i18n.logoutputencoding</tt> in <tt>.git/config</tt> file, like this:
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]828</p>
829<div class="listingblock">
830<div class="content">
Junio C Hamano35bb3f62007-02-19 05:35:53[diff] [blame]831<pre><tt>[i18n]
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]832 logoutputencoding = ISO-8859-1</tt></pre>
833</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]834<div class="paragraph"><p>If you do not have this configuration variable, the value of
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]835<tt>i18n.commitencoding</tt> is used instead.</p></div>
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]836</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]837</ol></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]838<div class="paragraph"><p>Note that we deliberately chose not to re-code the commit log
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]839message when a commit is made to force UTF-8 at the commit
840object level, because re-coding to UTF-8 is not necessarily a
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]841reversible operation.</p></div>
Junio C Hamano775a0f42006-12-31 01:19:14[diff] [blame]842</div>
Junio C Hamano5a73f302011-10-14 05:58:34[diff] [blame]843<h2 id="_files">FILES</h2>
844<div class="sectionbody">
845<div class="paragraph"><p>/etc/mailname</p></div>
846</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]847<h2 id="_see_also">SEE ALSO</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]848<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]849<div class="paragraph"><p><a href="git-write-tree.html">git-write-tree(1)</a></p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]850</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]851<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]852<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]853<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]854</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]855</div>
856<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]857<div id="footer">
858<div id="footer-text">
Junio C Hamano515ab1d2011-12-09 23:41:20[diff] [blame]859Last updated 2011-12-09 15:40:58 PDT
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]860</div>
861</div>
862</body>
863</html>