blob: 66d7e911fc38dcfc7d25326150e4be285cca4e28 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:231<!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>
Junio C Hamano9d971152012-12-19 00:43:115<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
Junio C Hamanoc14e6ad2014-10-31 20:25:536<meta name="generator" content="AsciiDoc 8.6.9" />
Junio C Hamano60186642010-12-02 14:18:267<title>git-commit(1)</title>
Junio C Hamano1a4e8412005-12-27 08:17:238<style type="text/css">
Junio C Hamano9d971152012-12-19 00:43:119/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
10
11/* Default font. */
12body {
13 font-family: Georgia,serif;
14}
15
16/* Title font. */
17h1, h2, h3, h4, h5, h6,
18div.title, caption.title,
19thead, p.table.header,
20#toctitle,
21#author, #revnumber, #revdate, #revremark,
22#footer {
23 font-family: Arial,Helvetica,sans-serif;
Junio C Hamano1a4e8412005-12-27 08:17:2324}
25
26body {
27 margin: 1em 5% 1em 5%;
28}
29
Junio C Hamanoba4b9282008-07-06 05:20:3130a {
31 color: blue;
32 text-decoration: underline;
33}
34a:visited {
35 color: fuchsia;
36}
Junio C Hamano1a4e8412005-12-27 08:17:2337
38em {
39 font-style: italic;
Junio C Hamano60186642010-12-02 14:18:2640 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:2341}
42
43strong {
44 font-weight: bold;
Junio C Hamano60186642010-12-02 14:18:2645 color: #083194;
Junio C Hamano1a4e8412005-12-27 08:17:2346}
47
Junio C Hamano1a4e8412005-12-27 08:17:2348h1, h2, h3, h4, h5, h6 {
49 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:2350 margin-top: 1.2em;
51 margin-bottom: 0.5em;
52 line-height: 1.3;
53}
54
Junio C Hamanoba4b9282008-07-06 05:20:3155h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:2356 border-bottom: 2px solid silver;
57}
58h2 {
Junio C Hamano1a4e8412005-12-27 08:17:2359 padding-top: 0.5em;
60}
Junio C Hamanoba4b9282008-07-06 05:20:3161h3 {
62 float: left;
63}
64h3 + * {
65 clear: left;
66}
Junio C Hamano9d971152012-12-19 00:43:1167h5 {
68 font-size: 1.0em;
69}
Junio C Hamano1a4e8412005-12-27 08:17:2370
71div.sectionbody {
Junio C Hamano1a4e8412005-12-27 08:17:2372 margin-left: 0;
73}
74
75hr {
76 border: 1px solid silver;
77}
78
79p {
80 margin-top: 0.5em;
81 margin-bottom: 0.5em;
82}
83
Junio C Hamano60186642010-12-02 14:18:2684ul, ol, li > p {
85 margin-top: 0;
86}
Junio C Hamano9d971152012-12-19 00:43:1187ul > li { color: #aaa; }
88ul > li > * { color: black; }
Junio C Hamano60186642010-12-02 14:18:2689
Junio C Hamanoc14e6ad2014-10-31 20:25:5390.monospaced, code, pre {
91 font-family: "Courier New", Courier, monospace;
92 font-size: inherit;
93 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:2394 padding: 0;
95 margin: 0;
96}
Junio C Hamanoc14e6ad2014-10-31 20:25:5397pre {
98 white-space: pre-wrap;
99}
Junio C Hamano1a4e8412005-12-27 08:17:23100
Junio C Hamano9d971152012-12-19 00:43:11101#author {
Junio C Hamano1a4e8412005-12-27 08:17:23102 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23103 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31104 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23105}
Junio C Hamano9d971152012-12-19 00:43:11106#email {
Junio C Hamano1a4e8412005-12-27 08:17:23107}
Junio C Hamano9d971152012-12-19 00:43:11108#revnumber, #revdate, #revremark {
Junio C Hamano1a4e8412005-12-27 08:17:23109}
110
Junio C Hamano9d971152012-12-19 00:43:11111#footer {
Junio C Hamano1a4e8412005-12-27 08:17:23112 font-size: small;
113 border-top: 2px solid silver;
114 padding-top: 0.5em;
115 margin-top: 4.0em;
116}
Junio C Hamano9d971152012-12-19 00:43:11117#footer-text {
Junio C Hamano1a4e8412005-12-27 08:17:23118 float: left;
119 padding-bottom: 0.5em;
120}
Junio C Hamano9d971152012-12-19 00:43:11121#footer-badges {
Junio C Hamano1a4e8412005-12-27 08:17:23122 float: right;
123 padding-bottom: 0.5em;
124}
125
Junio C Hamano9d971152012-12-19 00:43:11126#preamble {
Junio C Hamano60186642010-12-02 14:18:26127 margin-top: 1.5em;
128 margin-bottom: 1.5em;
129}
Junio C Hamano9d971152012-12-19 00:43:11130div.imageblock, div.exampleblock, div.verseblock,
Junio C Hamano1a4e8412005-12-27 08:17:23131div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
132div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22133 margin-top: 1.0em;
Junio C Hamano1a4e8412005-12-27 08:17:23134 margin-bottom: 1.5em;
135}
136div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22137 margin-top: 2.0em;
138 margin-bottom: 2.0em;
139 margin-right: 10%;
140 color: #606060;
Junio C Hamano1a4e8412005-12-27 08:17:23141}
142
143div.content { /* Block element content. */
144 padding: 0;
145}
146
147/* Block element titles. */
148div.title, caption.title {
Junio C Hamano60186642010-12-02 14:18:26149 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23150 font-weight: bold;
151 text-align: left;
152 margin-top: 1.0em;
153 margin-bottom: 0.5em;
154}
155div.title + * {
156 margin-top: 0;
157}
158
159td div.title:first-child {
160 margin-top: 0.0em;
161}
162div.content div.title:first-child {
163 margin-top: 0.0em;
164}
165div.content + div.title {
166 margin-top: 0.0em;
167}
168
169div.sidebarblock > div.content {
170 background: #ffffee;
Junio C Hamano9d971152012-12-19 00:43:11171 border: 1px solid #dddddd;
172 border-left: 4px solid #f0f0f0;
Junio C Hamano1a4e8412005-12-27 08:17:23173 padding: 0.5em;
174}
175
176div.listingblock > div.content {
Junio C Hamano9d971152012-12-19 00:43:11177 border: 1px solid #dddddd;
178 border-left: 5px solid #f0f0f0;
179 background: #f8f8f8;
Junio C Hamano1a4e8412005-12-27 08:17:23180 padding: 0.5em;
181}
182
Junio C Hamano7bd050f2011-09-22 06:32:22183div.quoteblock, div.verseblock {
184 padding-left: 1.0em;
185 margin-left: 1.0em;
Junio C Hamano60186642010-12-02 14:18:26186 margin-right: 10%;
Junio C Hamano9d971152012-12-19 00:43:11187 border-left: 5px solid #f0f0f0;
188 color: #888;
Junio C Hamano1a4e8412005-12-27 08:17:23189}
Junio C Hamano7bd050f2011-09-22 06:32:22190
Junio C Hamano60186642010-12-02 14:18:26191div.quoteblock > div.attribution {
192 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23193 text-align: right;
194}
Junio C Hamano60186642010-12-02 14:18:26195
Junio C Hamano9d971152012-12-19 00:43:11196div.verseblock > pre.content {
197 font-family: inherit;
198 font-size: inherit;
Junio C Hamano60186642010-12-02 14:18:26199}
200div.verseblock > div.attribution {
201 padding-top: 0.75em;
202 text-align: left;
203}
204/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31205div.verseblock + div.attribution {
206 text-align: left;
207}
Junio C Hamano1a4e8412005-12-27 08:17:23208
209div.admonitionblock .icon {
210 vertical-align: top;
211 font-size: 1.1em;
212 font-weight: bold;
213 text-decoration: underline;
214 color: #527bbd;
215 padding-right: 0.5em;
216}
217div.admonitionblock td.content {
218 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22219 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23220}
221
222div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22223 border-left: 3px solid #dddddd;
224 padding-left: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23225}
226
Junio C Hamano1a4e8412005-12-27 08:17:23227div.imageblock div.content { padding-left: 0; }
Junio C Hamanoc14e6ad2014-10-31 20:25:53228span.image img { border-style: none; vertical-align: text-bottom; }
Junio C Hamano60186642010-12-02 14:18:26229a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23230
231dl {
232 margin-top: 0.8em;
233 margin-bottom: 0.8em;
234}
235dt {
236 margin-top: 0.5em;
237 margin-bottom: 0;
Junio C Hamano60186642010-12-02 14:18:26238 font-style: normal;
239 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23240}
241dd > *:first-child {
Junio C Hamano60186642010-12-02 14:18:26242 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23243}
244
245ul, ol {
246 list-style-position: outside;
247}
Junio C Hamano60186642010-12-02 14:18:26248ol.arabic {
249 list-style-type: decimal;
250}
251ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23252 list-style-type: lower-alpha;
253}
Junio C Hamano60186642010-12-02 14:18:26254ol.upperalpha {
255 list-style-type: upper-alpha;
256}
257ol.lowerroman {
258 list-style-type: lower-roman;
259}
260ol.upperroman {
261 list-style-type: upper-roman;
262}
263
264div.compact ul, div.compact ol,
265div.compact p, div.compact p,
266div.compact div, div.compact div {
267 margin-top: 0.1em;
268 margin-bottom: 0.1em;
269}
Junio C Hamano1a4e8412005-12-27 08:17:23270
Junio C Hamano1a4e8412005-12-27 08:17:23271tfoot {
272 font-weight: bold;
273}
Junio C Hamano60186642010-12-02 14:18:26274td > div.verse {
275 white-space: pre;
276}
Junio C Hamano60186642010-12-02 14:18:26277
278div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23279 margin-top: 0.8em;
280 margin-bottom: 0.8em;
281}
Junio C Hamano60186642010-12-02 14:18:26282div.hdlist tr {
283 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31284}
Junio C Hamano60186642010-12-02 14:18:26285dt.hdlist1.strong, td.hdlist1.strong {
286 font-weight: bold;
287}
288td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23289 vertical-align: top;
Junio C Hamano60186642010-12-02 14:18:26290 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23291 padding-right: 0.8em;
Junio C Hamano60186642010-12-02 14:18:26292 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23293}
Junio C Hamano60186642010-12-02 14:18:26294td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23295 vertical-align: top;
296}
Junio C Hamano60186642010-12-02 14:18:26297div.hdlist.compact tr {
298 margin: 0;
299 padding-bottom: 0;
300}
301
302.comment {
303 background: yellow;
304}
Junio C Hamano1a4e8412005-12-27 08:17:23305
Junio C Hamano7bd050f2011-09-22 06:32:22306.footnote, .footnoteref {
307 font-size: 0.8em;
308}
309
310span.footnote, span.footnoteref {
311 vertical-align: super;
312}
313
314#footnotes {
315 margin: 20px 0 20px 0;
316 padding: 7px 0 0 0;
317}
318
319#footnotes div.footnote {
320 margin: 0 0 5px 0;
321}
322
323#footnotes hr {
324 border: none;
325 border-top: 1px solid silver;
326 height: 1px;
327 text-align: left;
328 margin-left: 0;
329 width: 20%;
330 min-width: 100px;
331}
332
Junio C Hamano9d971152012-12-19 00:43:11333div.colist td {
334 padding-right: 0.5em;
335 padding-bottom: 0.3em;
336 vertical-align: top;
337}
338div.colist td img {
339 margin-top: 0.3em;
Junio C Hamano1a4e8412005-12-27 08:17:23340}
Junio C Hamanoba4b9282008-07-06 05:20:31341
Junio C Hamano9d971152012-12-19 00:43:11342@media print {
343 #footer-badges { display: none; }
344}
345
346#toc {
Junio C Hamano7bd050f2011-09-22 06:32:22347 margin-bottom: 2.5em;
348}
349
Junio C Hamano9d971152012-12-19 00:43:11350#toctitle {
Junio C Hamanoba4b9282008-07-06 05:20:31351 color: #527bbd;
Junio C Hamanoba4b9282008-07-06 05:20:31352 font-size: 1.1em;
353 font-weight: bold;
354 margin-top: 1.0em;
355 margin-bottom: 0.1em;
356}
357
Junio C Hamanoc14e6ad2014-10-31 20:25:53358div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
Junio C Hamanoba4b9282008-07-06 05:20:31359 margin-top: 0;
360 margin-bottom: 0;
361}
362div.toclevel2 {
363 margin-left: 2em;
364 font-size: 0.9em;
365}
366div.toclevel3 {
367 margin-left: 4em;
368 font-size: 0.9em;
369}
370div.toclevel4 {
371 margin-left: 6em;
372 font-size: 0.9em;
373}
Junio C Hamano9d971152012-12-19 00:43:11374
375span.aqua { color: aqua; }
376span.black { color: black; }
377span.blue { color: blue; }
378span.fuchsia { color: fuchsia; }
379span.gray { color: gray; }
380span.green { color: green; }
381span.lime { color: lime; }
382span.maroon { color: maroon; }
383span.navy { color: navy; }
384span.olive { color: olive; }
385span.purple { color: purple; }
386span.red { color: red; }
387span.silver { color: silver; }
388span.teal { color: teal; }
389span.white { color: white; }
390span.yellow { color: yellow; }
391
392span.aqua-background { background: aqua; }
393span.black-background { background: black; }
394span.blue-background { background: blue; }
395span.fuchsia-background { background: fuchsia; }
396span.gray-background { background: gray; }
397span.green-background { background: green; }
398span.lime-background { background: lime; }
399span.maroon-background { background: maroon; }
400span.navy-background { background: navy; }
401span.olive-background { background: olive; }
402span.purple-background { background: purple; }
403span.red-background { background: red; }
404span.silver-background { background: silver; }
405span.teal-background { background: teal; }
406span.white-background { background: white; }
407span.yellow-background { background: yellow; }
408
409span.big { font-size: 2em; }
410span.small { font-size: 0.6em; }
411
412span.underline { text-decoration: underline; }
413span.overline { text-decoration: overline; }
414span.line-through { text-decoration: line-through; }
415
Junio C Hamanoc14e6ad2014-10-31 20:25:53416div.unbreakable { page-break-inside: avoid; }
417
Junio C Hamano9d971152012-12-19 00:43:11418
419/*
420 * xhtml11 specific
421 *
422 * */
423
424div.tableblock {
425 margin-top: 1.0em;
426 margin-bottom: 1.5em;
427}
428div.tableblock > table {
429 border: 3px solid #527bbd;
430}
431thead, p.table.header {
432 font-weight: bold;
433 color: #527bbd;
434}
435p.table {
436 margin-top: 0;
437}
438/* Because the table frame attribute is overriden by CSS in most browsers. */
439div.tableblock > table[frame="void"] {
440 border-style: none;
441}
442div.tableblock > table[frame="hsides"] {
443 border-left-style: none;
444 border-right-style: none;
445}
446div.tableblock > table[frame="vsides"] {
447 border-top-style: none;
448 border-bottom-style: none;
449}
450
451
452/*
453 * html5 specific
454 *
455 * */
456
457table.tableblock {
458 margin-top: 1.0em;
459 margin-bottom: 1.5em;
460}
461thead, p.tableblock.header {
462 font-weight: bold;
463 color: #527bbd;
464}
465p.tableblock {
466 margin-top: 0;
467}
468table.tableblock {
469 border-width: 3px;
470 border-spacing: 0px;
471 border-style: solid;
472 border-color: #527bbd;
473 border-collapse: collapse;
474}
475th.tableblock, td.tableblock {
476 border-width: 1px;
477 padding: 4px;
478 border-style: solid;
479 border-color: #527bbd;
480}
481
482table.tableblock.frame-topbot {
483 border-left-style: hidden;
484 border-right-style: hidden;
485}
486table.tableblock.frame-sides {
487 border-top-style: hidden;
488 border-bottom-style: hidden;
489}
490table.tableblock.frame-none {
491 border-style: hidden;
492}
493
494th.tableblock.halign-left, td.tableblock.halign-left {
495 text-align: left;
496}
497th.tableblock.halign-center, td.tableblock.halign-center {
498 text-align: center;
499}
500th.tableblock.halign-right, td.tableblock.halign-right {
501 text-align: right;
502}
503
504th.tableblock.valign-top, td.tableblock.valign-top {
505 vertical-align: top;
506}
507th.tableblock.valign-middle, td.tableblock.valign-middle {
508 vertical-align: middle;
509}
510th.tableblock.valign-bottom, td.tableblock.valign-bottom {
511 vertical-align: bottom;
512}
513
514
515/*
516 * manpage specific
517 *
518 * */
519
520body.manpage h1 {
Junio C Hamano60186642010-12-02 14:18:26521 padding-top: 0.5em;
522 padding-bottom: 0.5em;
523 border-top: 2px solid silver;
524 border-bottom: 2px solid silver;
525}
Junio C Hamano9d971152012-12-19 00:43:11526body.manpage h2 {
Junio C Hamano60186642010-12-02 14:18:26527 border-style: none;
528}
Junio C Hamano9d971152012-12-19 00:43:11529body.manpage div.sectionbody {
530 margin-left: 3em;
Junio C Hamano60186642010-12-02 14:18:26531}
532
533@media print {
Junio C Hamano9d971152012-12-19 00:43:11534 body.manpage div#toc { display: none; }
Junio C Hamano60186642010-12-02 14:18:26535}
Junio C Hamanoc14e6ad2014-10-31 20:25:53536
537
Junio C Hamano1a4e8412005-12-27 08:17:23538</style>
Junio C Hamano7bd050f2011-09-22 06:32:22539<script type="text/javascript">
540/*<![CDATA[*/
Junio C Hamano7bd050f2011-09-22 06:32:22541var asciidoc = { // Namespace.
542
543/////////////////////////////////////////////////////////////////////
544// Table Of Contents generator
545/////////////////////////////////////////////////////////////////////
546
547/* Author: Mihai Bazon, September 2002
548 * http://students.infoiasi.ro/~mishoo
549 *
550 * Table Of Content generator
551 * Version: 0.4
552 *
553 * Feel free to use this script under the terms of the GNU General Public
554 * License, as long as you do not remove or alter this notice.
555 */
556
557 /* modified by Troy D. Hanson, September 2006. License: GPL */
558 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
559
560// toclevels = 1..4.
561toc: function (toclevels) {
562
563 function getText(el) {
564 var text = "";
565 for (var i = el.firstChild; i != null; i = i.nextSibling) {
566 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
567 text += i.data;
568 else if (i.firstChild != null)
569 text += getText(i);
570 }
571 return text;
572 }
573
574 function TocEntry(el, text, toclevel) {
575 this.element = el;
576 this.text = text;
577 this.toclevel = toclevel;
578 }
579
580 function tocEntries(el, toclevels) {
581 var result = new Array;
Junio C Hamanoc14e6ad2014-10-31 20:25:53582 var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
Junio C Hamano7bd050f2011-09-22 06:32:22583 // Function that scans the DOM tree for header elements (the DOM2
584 // nodeIterator API would be a better technique but not supported by all
585 // browsers).
586 var iterate = function (el) {
587 for (var i = el.firstChild; i != null; i = i.nextSibling) {
588 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
589 var mo = re.exec(i.tagName);
590 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
591 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
592 }
593 iterate(i);
594 }
595 }
596 }
597 iterate(el);
598 return result;
599 }
600
601 var toc = document.getElementById("toc");
Junio C Hamano9d971152012-12-19 00:43:11602 if (!toc) {
603 return;
604 }
605
606 // Delete existing TOC entries in case we're reloading the TOC.
607 var tocEntriesToRemove = [];
608 var i;
609 for (i = 0; i < toc.childNodes.length; i++) {
610 var entry = toc.childNodes[i];
Junio C Hamanoc14e6ad2014-10-31 20:25:53611 if (entry.nodeName.toLowerCase() == 'div'
Junio C Hamano9d971152012-12-19 00:43:11612 && entry.getAttribute("class")
613 && entry.getAttribute("class").match(/^toclevel/))
614 tocEntriesToRemove.push(entry);
615 }
616 for (i = 0; i < tocEntriesToRemove.length; i++) {
617 toc.removeChild(tocEntriesToRemove[i]);
618 }
619
620 // Rebuild TOC entries.
Junio C Hamano7bd050f2011-09-22 06:32:22621 var entries = tocEntries(document.getElementById("content"), toclevels);
622 for (var i = 0; i < entries.length; ++i) {
623 var entry = entries[i];
624 if (entry.element.id == "")
625 entry.element.id = "_toc_" + i;
626 var a = document.createElement("a");
627 a.href = "#" + entry.element.id;
628 a.appendChild(document.createTextNode(entry.text));
629 var div = document.createElement("div");
630 div.appendChild(a);
631 div.className = "toclevel" + entry.toclevel;
632 toc.appendChild(div);
633 }
634 if (entries.length == 0)
635 toc.parentNode.removeChild(toc);
636},
637
638
639/////////////////////////////////////////////////////////////////////
640// Footnotes generator
641/////////////////////////////////////////////////////////////////////
642
643/* Based on footnote generation code from:
644 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
645 */
646
647footnotes: function () {
Junio C Hamano9d971152012-12-19 00:43:11648 // Delete existing footnote entries in case we're reloading the footnodes.
649 var i;
Junio C Hamano7bd050f2011-09-22 06:32:22650 var noteholder = document.getElementById("footnotes");
Junio C Hamano9d971152012-12-19 00:43:11651 if (!noteholder) {
652 return;
653 }
654 var entriesToRemove = [];
655 for (i = 0; i < noteholder.childNodes.length; i++) {
656 var entry = noteholder.childNodes[i];
Junio C Hamanoc14e6ad2014-10-31 20:25:53657 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
Junio C Hamano9d971152012-12-19 00:43:11658 entriesToRemove.push(entry);
659 }
660 for (i = 0; i < entriesToRemove.length; i++) {
661 noteholder.removeChild(entriesToRemove[i]);
662 }
663
664 // Rebuild footnote entries.
665 var cont = document.getElementById("content");
Junio C Hamano7bd050f2011-09-22 06:32:22666 var spans = cont.getElementsByTagName("span");
667 var refs = {};
668 var n = 0;
669 for (i=0; i<spans.length; i++) {
670 if (spans[i].className == "footnote") {
671 n++;
Junio C Hamano9d971152012-12-19 00:43:11672 var note = spans[i].getAttribute("data-note");
673 if (!note) {
674 // Use [\s\S] in place of . so multi-line matches work.
675 // Because JavaScript has no s (dotall) regex flag.
676 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
677 spans[i].innerHTML =
678 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
679 "' title='View footnote' class='footnote'>" + n + "</a>]";
680 spans[i].setAttribute("data-note", note);
681 }
Junio C Hamano7bd050f2011-09-22 06:32:22682 noteholder.innerHTML +=
683 "<div class='footnote' id='_footnote_" + n + "'>" +
684 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
685 n + "</a>. " + note + "</div>";
Junio C Hamano7bd050f2011-09-22 06:32:22686 var id =spans[i].getAttribute("id");
687 if (id != null) refs["#"+id] = n;
688 }
689 }
690 if (n == 0)
691 noteholder.parentNode.removeChild(noteholder);
692 else {
693 // Process footnoterefs.
694 for (i=0; i<spans.length; i++) {
695 if (spans[i].className == "footnoteref") {
696 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
697 href = href.match(/#.*/)[0]; // Because IE return full URL.
698 n = refs[href];
699 spans[i].innerHTML =
700 "[<a href='#_footnote_" + n +
701 "' title='View footnote' class='footnote'>" + n + "</a>]";
702 }
703 }
704 }
Junio C Hamano9d971152012-12-19 00:43:11705},
706
707install: function(toclevels) {
708 var timerId;
709
710 function reinstall() {
711 asciidoc.footnotes();
712 if (toclevels) {
713 asciidoc.toc(toclevels);
714 }
715 }
716
717 function reinstallAndRemoveTimer() {
718 clearInterval(timerId);
719 reinstall();
720 }
721
722 timerId = setInterval(reinstall, 500);
723 if (document.addEventListener)
724 document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
725 else
726 window.onload = reinstallAndRemoveTimer;
Junio C Hamano7bd050f2011-09-22 06:32:22727}
728
729}
Junio C Hamano9d971152012-12-19 00:43:11730asciidoc.install();
Junio C Hamano7bd050f2011-09-22 06:32:22731/*]]>*/
732</script>
Junio C Hamano1a4e8412005-12-27 08:17:23733</head>
Junio C Hamano9d971152012-12-19 00:43:11734<body class="manpage">
Junio C Hamano1a4e8412005-12-27 08:17:23735<div id="header">
736<h1>
737git-commit(1) Manual Page
738</h1>
739<h2>NAME</h2>
740<div class="sectionbody">
741<p>git-commit -
Junio C Hamano7c73c662007-01-19 00:37:50742 Record changes to the repository
Junio C Hamano1a4e8412005-12-27 08:17:23743</p>
744</div>
745</div>
Junio C Hamano7bd050f2011-09-22 06:32:22746<div id="content">
Junio C Hamano9d971152012-12-19 00:43:11747<div class="sect1">
Junio C Hamano60186642010-12-02 14:18:26748<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23749<div class="sectionbody">
Junio C Hamano235a91e2006-01-07 01:13:58750<div class="verseblock">
Junio C Hamano9d971152012-12-19 00:43:11751<pre class="content"><em>git commit</em> [-a | --interactive | --patch] [-s] [-v] [-u&lt;mode&gt;] [--amend]
Junio C Hamano3d050d62011-05-17 06:43:34752 [--dry-run] [(-c | -C | --fixup | --squash) &lt;commit&gt;]
753 [-F &lt;file&gt; | -m &lt;msg&gt;] [--reset-author] [--allow-empty]
754 [--allow-empty-message] [--no-verify] [-e] [--author=&lt;author&gt;]
Junio C Hamano3d1b5a12013-05-17 23:34:02755 [--date=&lt;date&gt;] [--cleanup=&lt;mode&gt;] [--[no-]status]
Junio C Hamano1eb56092015-10-05 20:39:53756 [-i | -o] [-S[&lt;keyid&gt;]] [--] [&lt;file&gt;&#8230;]</pre>
Junio C Hamano9d971152012-12-19 00:43:11757<div class="attribution">
Junio C Hamano60186642010-12-02 14:18:26758</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23759</div>
Junio C Hamano9d971152012-12-19 00:43:11760</div>
761<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31762<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23763<div class="sectionbody">
Junio C Hamano60186642010-12-02 14:18:26764<div class="paragraph"><p>Stores the current contents of the index in a new commit along
Junio C Hamanoba4b9282008-07-06 05:20:31765with a log message from the user describing the changes.</p></div>
Junio C Hamano60186642010-12-02 14:18:26766<div class="paragraph"><p>The content to be added can be specified in several ways:</p></div>
767<div class="olist arabic"><ol class="arabic">
Junio C Hamanoe7935c42006-12-13 21:32:17768<li>
769<p>
Junio C Hamano1aa40d22010-01-21 17:46:43770by using <em>git add</em> to incrementally "add" changes to the
Junio C Hamanob515b6a2007-08-08 09:21:16771 index before using the <em>commit</em> command (Note: even modified
772 files must be "added");
773</p>
774</li>
775<li>
776<p>
Junio C Hamano1aa40d22010-01-21 17:46:43777by using <em>git rm</em> to remove files from the working tree
Junio C Hamanobd2b4bb2007-08-06 06:42:24778 and the index, again before using the <em>commit</em> command;
Junio C Hamanoe7935c42006-12-13 21:32:17779</p>
780</li>
781<li>
782<p>
Junio C Hamanobd2b4bb2007-08-06 06:42:24783by listing files as arguments to the <em>commit</em> command, in which
784 case the commit will ignore changes staged in the index, and instead
Junio C Hamano50819852008-11-19 02:07:56785 record the current content of the listed files (which must already
Junio C Hamano076ffcc2013-02-06 05:13:21786 be known to Git);
Junio C Hamanoe7935c42006-12-13 21:32:17787</p>
788</li>
789<li>
790<p>
Junio C Hamanobd2b4bb2007-08-06 06:42:24791by using the -a switch with the <em>commit</em> command to automatically
792 "add" changes from all known files (i.e. all files that are already
793 listed in the index) and to automatically "rm" files in the index
794 that have been removed from the working tree, and then perform the
795 actual commit;
Junio C Hamanoe7935c42006-12-13 21:32:17796</p>
797</li>
Junio C Hamanoc51fede2007-03-12 07:29:20798<li>
799<p>
Junio C Hamano3d050d62011-05-17 06:43:34800by using the --interactive or --patch switches with the <em>commit</em> command
801 to decide one by one which files or hunks should be part of the commit,
Junio C Hamanob76a6862012-05-02 22:02:46802 before finalizing the operation. See the &#8220;Interactive Mode&#8221; section of
Junio C Hamanoa28a9202012-06-21 07:08:23803 <a href="git-add.html">git-add(1)</a> to learn how to operate these modes.
Junio C Hamanoc51fede2007-03-12 07:29:20804</p>
805</li>
Junio C Hamanoba4b9282008-07-06 05:20:31806</ol></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53807<div class="paragraph"><p>The <code>--dry-run</code> option can be used to obtain a
Junio C Hamanoe7935c42006-12-13 21:32:17808summary of what is included by any of the above for the next
Junio C Hamano1bb31992009-08-29 04:24:08809commit by giving the same set of parameters (options and paths).</p></div>
Junio C Hamano60186642010-12-02 14:18:26810<div class="paragraph"><p>If you make a commit and then find a mistake immediately after
Junio C Hamano1aa40d22010-01-21 17:46:43811that, you can recover from it with <em>git reset</em>.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23812</div>
Junio C Hamano9d971152012-12-19 00:43:11813</div>
814<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31815<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23816<div class="sectionbody">
Junio C Hamano60186642010-12-02 14:18:26817<div class="dlist"><dl>
818<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47819-a
820</dt>
Junio C Hamano60186642010-12-02 14:18:26821<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47822--all
Junio C Hamano1a4e8412005-12-27 08:17:23823</dt>
824<dd>
825<p>
Junio C Hamanoe7935c42006-12-13 21:32:17826 Tell the command to automatically stage files that have
827 been modified and deleted, but new files you have not
Junio C Hamano076ffcc2013-02-06 05:13:21828 told Git about are not affected.
Junio C Hamano1a4e8412005-12-27 08:17:23829</p>
830</dd>
Junio C Hamano60186642010-12-02 14:18:26831<dt class="hdlist1">
Junio C Hamano3d050d62011-05-17 06:43:34832-p
833</dt>
834<dt class="hdlist1">
835--patch
836</dt>
837<dd>
838<p>
839 Use the interactive patch selection interface to chose
Junio C Hamanoa28a9202012-06-21 07:08:23840 which changes to commit. See <a href="git-add.html">git-add(1)</a> for
Junio C Hamano3d050d62011-05-17 06:43:34841 details.
842</p>
843</dd>
844<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47845-C &lt;commit&gt;
846</dt>
Junio C Hamano60186642010-12-02 14:18:26847<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47848--reuse-message=&lt;commit&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23849</dt>
850<dd>
851<p>
Junio C Hamanoeb415992008-06-08 22:49:47852 Take an existing commit object, and reuse the log message
Junio C Hamano1a4e8412005-12-27 08:17:23853 and the authorship information (including the timestamp)
Junio C Hamanoeb415992008-06-08 22:49:47854 when creating the commit.
855</p>
856</dd>
Junio C Hamano60186642010-12-02 14:18:26857<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47858-c &lt;commit&gt;
859</dt>
Junio C Hamano60186642010-12-02 14:18:26860<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47861--reedit-message=&lt;commit&gt;
862</dt>
863<dd>
864<p>
865 Like <em>-C</em>, but with <em>-c</em> the editor is invoked, so that
866 the user can further edit the commit message.
Junio C Hamano1a4e8412005-12-27 08:17:23867</p>
868</dd>
Junio C Hamano60186642010-12-02 14:18:26869<dt class="hdlist1">
Junio C Hamano2e6ded82010-12-05 06:20:48870--fixup=&lt;commit&gt;
871</dt>
872<dd>
873<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53874 Construct a commit message for use with <code>rebase --autosquash</code>.
Junio C Hamano2e6ded82010-12-05 06:20:48875 The commit message will be the subject line from the specified
Junio C Hamanoa28a9202012-06-21 07:08:23876 commit with a prefix of "fixup! ". See <a href="git-rebase.html">git-rebase(1)</a>
Junio C Hamano2e6ded82010-12-05 06:20:48877 for details.
878</p>
879</dd>
880<dt class="hdlist1">
881--squash=&lt;commit&gt;
882</dt>
883<dd>
884<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53885 Construct a commit message for use with <code>rebase --autosquash</code>.
Junio C Hamano2e6ded82010-12-05 06:20:48886 The commit message subject line is taken from the specified
887 commit with a prefix of "squash! ". Can be used with additional
Junio C Hamanoc14e6ad2014-10-31 20:25:53888 commit message options (<code>-m</code>/<code>-c</code>/<code>-C</code>/<code>-F</code>). See
Junio C Hamanoa28a9202012-06-21 07:08:23889 <a href="git-rebase.html">git-rebase(1)</a> for details.
Junio C Hamano2e6ded82010-12-05 06:20:48890</p>
891</dd>
892<dt class="hdlist1">
Junio C Hamano2bd8a742009-12-01 21:16:59893--reset-author
894</dt>
895<dd>
896<p>
Junio C Hamanoa8cc1d82011-03-10 01:18:12897 When used with -C/-c/--amend options, or when committing after a
898 a conflicting cherry-pick, declare that the authorship of the
Junio C Hamano85f1fde2015-06-01 20:37:32899 resulting commit now belongs to the committer. This also renews
Junio C Hamanoa8cc1d82011-03-10 01:18:12900 the author timestamp.
Junio C Hamano2bd8a742009-12-01 21:16:59901</p>
902</dd>
Junio C Hamano60186642010-12-02 14:18:26903<dt class="hdlist1">
Junio C Hamanoa0fae262009-12-28 09:33:50904--short
905</dt>
906<dd>
907<p>
908 When doing a dry-run, give the output in the short-format. See
Junio C Hamanoc14e6ad2014-10-31 20:25:53909 <a href="git-status.html">git-status(1)</a> for details. Implies <code>--dry-run</code>.
Junio C Hamanoa0fae262009-12-28 09:33:50910</p>
911</dd>
Junio C Hamano60186642010-12-02 14:18:26912<dt class="hdlist1">
Junio C Hamano9257a332012-06-25 20:01:02913--branch
914</dt>
915<dd>
916<p>
917 Show the branch and tracking info even in short-format.
918</p>
919</dd>
920<dt class="hdlist1">
Junio C Hamanoa0fae262009-12-28 09:33:50921--porcelain
922</dt>
923<dd>
924<p>
925 When doing a dry-run, give the output in a porcelain-ready
Junio C Hamanoa28a9202012-06-21 07:08:23926 format. See <a href="git-status.html">git-status(1)</a> for details. Implies
Junio C Hamanoc14e6ad2014-10-31 20:25:53927 <code>--dry-run</code>.
Junio C Hamanoa0fae262009-12-28 09:33:50928</p>
929</dd>
Junio C Hamano60186642010-12-02 14:18:26930<dt class="hdlist1">
Junio C Hamanoa1295452012-11-13 22:32:04931--long
932</dt>
933<dd>
934<p>
935 When doing a dry-run, give the output in a the long-format.
Junio C Hamanoc14e6ad2014-10-31 20:25:53936 Implies <code>--dry-run</code>.
Junio C Hamanoa1295452012-11-13 22:32:04937</p>
938</dd>
939<dt class="hdlist1">
Junio C Hamanoa0fae262009-12-28 09:33:50940-z
941</dt>
Junio C Hamano9257a332012-06-25 20:01:02942<dt class="hdlist1">
943--null
944</dt>
Junio C Hamanoa0fae262009-12-28 09:33:50945<dd>
946<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:53947 When showing <code>short</code> or <code>porcelain</code> status output, terminate
Junio C Hamanoa0fae262009-12-28 09:33:50948 entries in the status output with NUL, instead of LF. If no
Junio C Hamanoc14e6ad2014-10-31 20:25:53949 format is given, implies the <code>--porcelain</code> output format.
Junio C Hamanoa0fae262009-12-28 09:33:50950</p>
951</dd>
Junio C Hamano60186642010-12-02 14:18:26952<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23953-F &lt;file&gt;
954</dt>
Junio C Hamano60186642010-12-02 14:18:26955<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47956--file=&lt;file&gt;
957</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23958<dd>
959<p>
960 Take the commit message from the given file. Use <em>-</em> to
961 read the message from the standard input.
962</p>
963</dd>
Junio C Hamano60186642010-12-02 14:18:26964<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47965--author=&lt;author&gt;
Junio C Hamano40f2f8d2006-02-07 08:04:39966</dt>
967<dd>
968<p>
Junio C Hamano13002fb2010-06-08 05:53:58969 Override the commit author. Specify an explicit author using the
Junio C Hamanoc14e6ad2014-10-31 20:25:53970 standard <code>A U Thor &lt;author@example.com&gt;</code> format. Otherwise &lt;author&gt;
Junio C Hamano13002fb2010-06-08 05:53:58971 is assumed to be a pattern and is used to search for an existing
972 commit by that author (i.e. rev-list --all -i --author=&lt;author&gt;);
973 the commit author is then copied from the first such commit found.
Junio C Hamano40f2f8d2006-02-07 08:04:39974</p>
975</dd>
Junio C Hamano60186642010-12-02 14:18:26976<dt class="hdlist1">
Junio C Hamanoae05fee2010-01-08 07:39:46977--date=&lt;date&gt;
978</dt>
979<dd>
980<p>
981 Override the author date used in the commit.
982</p>
983</dd>
Junio C Hamano60186642010-12-02 14:18:26984<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47985-m &lt;msg&gt;
986</dt>
Junio C Hamano60186642010-12-02 14:18:26987<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47988--message=&lt;msg&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23989</dt>
990<dd>
991<p>
992 Use the given &lt;msg&gt; as the commit message.
Junio C Hamanoc14e6ad2014-10-31 20:25:53993 If multiple <code>-m</code> options are given, their values are
Junio C Hamano09cfe6f2013-03-27 22:10:42994 concatenated as separate paragraphs.
Junio C Hamano1a4e8412005-12-27 08:17:23995</p>
996</dd>
Junio C Hamano60186642010-12-02 14:18:26997<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47998-t &lt;file&gt;
999</dt>
Junio C Hamano60186642010-12-02 14:18:261000<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:471001--template=&lt;file&gt;
Junio C Hamanoa3770f92007-07-25 08:53:331002</dt>
1003<dd>
1004<p>
Junio C Hamano51f87de2012-04-16 21:18:541005 When editing the commit message, start the editor with the
Junio C Hamanoc14e6ad2014-10-31 20:25:531006 contents in the given file. The <code>commit.template</code> configuration
Junio C Hamano51f87de2012-04-16 21:18:541007 variable is often used to give this option implicitly to the
1008 command. This mechanism can be used by projects that want to
1009 guide participants with some hints on what to write in the message
1010 in what order. If the user exits the editor without editing the
1011 message, the commit is aborted. This has no effect when a message
Junio C Hamanoc14e6ad2014-10-31 20:25:531012 is given by other means, e.g. with the <code>-m</code> or <code>-F</code> options.
Junio C Hamanoa3770f92007-07-25 08:53:331013</p>
1014</dd>
Junio C Hamano60186642010-12-02 14:18:261015<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:471016-s
1017</dt>
Junio C Hamano60186642010-12-02 14:18:261018<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:471019--signoff
Junio C Hamano1a4e8412005-12-27 08:17:231020</dt>
1021<dd>
1022<p>
Junio C Hamano610d1762008-11-28 06:27:131023 Add Signed-off-by line by the committer at the end of the commit
Junio C Hamano7d06a8a2008-10-20 05:42:331024 log message.
Junio C Hamano1a4e8412005-12-27 08:17:231025</p>
1026</dd>
Junio C Hamano60186642010-12-02 14:18:261027<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:471028-n
1029</dt>
Junio C Hamano60186642010-12-02 14:18:261030<dt class="hdlist1">
Junio C Hamanoe7935c42006-12-13 21:32:171031--no-verify
Junio C Hamano1a4e8412005-12-27 08:17:231032</dt>
1033<dd>
1034<p>
Junio C Hamano942b35e2007-12-09 10:19:331035 This option bypasses the pre-commit and commit-msg hooks.
Junio C Hamanoa28a9202012-06-21 07:08:231036 See also <a href="githooks.html">githooks(5)</a>.
Junio C Hamano1a4e8412005-12-27 08:17:231037</p>
1038</dd>
Junio C Hamano60186642010-12-02 14:18:261039<dt class="hdlist1">
Junio C Hamano0c999702007-12-03 09:57:551040--allow-empty
1041</dt>
1042<dd>
1043<p>
1044 Usually recording a commit that has the exact same tree as its
Junio C Hamano58256872007-12-04 08:31:131045 sole parent commit is a mistake, and the command prevents you
1046 from making such a commit. This option bypasses the safety, and
Junio C Hamano619596a2010-08-18 22:15:351047 is primarily for use by foreign SCM interface scripts.
Junio C Hamano0c999702007-12-03 09:57:551048</p>
1049</dd>
Junio C Hamano60186642010-12-02 14:18:261050<dt class="hdlist1">
Junio C Hamanocb39aea2010-05-09 07:24:481051--allow-empty-message
1052</dt>
1053<dd>
1054<p>
1055 Like --allow-empty this command is primarily for use by foreign
Junio C Hamano619596a2010-08-18 22:15:351056 SCM interface scripts. It allows you to create a commit with an
Junio C Hamanocb39aea2010-05-09 07:24:481057 empty commit message without using plumbing commands like
Junio C Hamanoa28a9202012-06-21 07:08:231058 <a href="git-commit-tree.html">git-commit-tree(1)</a>.
Junio C Hamanocb39aea2010-05-09 07:24:481059</p>
1060</dd>
Junio C Hamano60186642010-12-02 14:18:261061<dt class="hdlist1">
Junio C Hamano554da792007-12-27 03:29:581062--cleanup=&lt;mode&gt;
1063</dt>
1064<dd>
1065<p>
Junio C Hamano5e7f1312013-03-21 22:49:011066 This option determines how the supplied commit message should be
Junio C Hamanoc14e6ad2014-10-31 20:25:531067 cleaned up before committing. The <em>&lt;mode&gt;</em> can be <code>strip</code>,
1068 <code>whitespace</code>, <code>verbatim</code>, <code>scissors</code> or <code>default</code>.
Junio C Hamano554da792007-12-27 03:29:581069</p>
Junio C Hamano5e7f1312013-03-21 22:49:011070<div class="openblock">
1071<div class="content">
1072<div class="dlist"><dl>
1073<dt class="hdlist1">
1074strip
1075</dt>
1076<dd>
1077<p>
Junio C Hamanoe1b28592015-05-19 21:26:171078 Strip leading and trailing empty lines, trailing whitespace,
1079 commentary and collapse consecutive empty lines.
Junio C Hamano5e7f1312013-03-21 22:49:011080</p>
1081</dd>
1082<dt class="hdlist1">
1083whitespace
1084</dt>
1085<dd>
1086<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:531087 Same as <code>strip</code> except #commentary is not removed.
Junio C Hamano5e7f1312013-03-21 22:49:011088</p>
1089</dd>
1090<dt class="hdlist1">
1091verbatim
1092</dt>
1093<dd>
1094<p>
1095 Do not change the message at all.
1096</p>
1097</dd>
1098<dt class="hdlist1">
Junio C Hamano3214e5f2014-03-25 19:54:381099scissors
1100</dt>
1101<dd>
1102<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:531103 Same as <code>whitespace</code>, except that everything from (and
Junio C Hamano3214e5f2014-03-25 19:54:381104 including) the line
Junio C Hamanoc14e6ad2014-10-31 20:25:531105 "<code># ------------------------ &gt;8 ------------------------</code>"
1106 is truncated if the message is to be edited. "<code>#</code>" can be
Junio C Hamano3214e5f2014-03-25 19:54:381107 customized with core.commentChar.
1108</p>
1109</dd>
1110<dt class="hdlist1">
Junio C Hamano5e7f1312013-03-21 22:49:011111default
1112</dt>
1113<dd>
1114<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:531115 Same as <code>strip</code> if the message is to be edited.
1116 Otherwise <code>whitespace</code>.
Junio C Hamano5e7f1312013-03-21 22:49:011117</p>
1118</dd>
1119</dl></div>
1120</div></div>
1121<div class="paragraph"><p>The default can be changed by the <em>commit.cleanup</em> configuration
1122variable (see <a href="git-config.html">git-config(1)</a>).</p></div>
Junio C Hamano554da792007-12-27 03:29:581123</dd>
Junio C Hamano60186642010-12-02 14:18:261124<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:471125-e
1126</dt>
Junio C Hamano60186642010-12-02 14:18:261127<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:471128--edit
Junio C Hamano1a4e8412005-12-27 08:17:231129</dt>
1130<dd>
1131<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:531132 The message taken from file with <code>-F</code>, command line with
1133 <code>-m</code>, and from commit object with <code>-C</code> are usually used as
Junio C Hamanoc097e562013-05-03 23:06:121134 the commit log message unmodified. This option lets you
Junio C Hamano1a4e8412005-12-27 08:17:231135 further edit the message taken from these sources.
1136</p>
1137</dd>
Junio C Hamano60186642010-12-02 14:18:261138<dt class="hdlist1">
Junio C Hamano4eb2b9c2012-11-15 21:12:291139--no-edit
1140</dt>
1141<dd>
1142<p>
1143 Use the selected commit message without launching an editor.
Junio C Hamanoc14e6ad2014-10-31 20:25:531144 For example, <code>git commit --amend --no-edit</code> amends a commit
Junio C Hamano4eb2b9c2012-11-15 21:12:291145 without changing its commit message.
1146</p>
1147</dd>
1148<dt class="hdlist1">
Junio C Hamanobfe9e752006-04-05 21:43:281149--amend
1150</dt>
1151<dd>
1152<p>
Junio C Hamano63b6fdb2013-04-07 23:37:131153 Replace the tip of the current branch by creating a new
1154 commit. The recorded tree is prepared as usual (including
Junio C Hamanoc14e6ad2014-10-31 20:25:531155 the effect of the <code>-i</code> and <code>-o</code> options and explicit
Junio C Hamano63b6fdb2013-04-07 23:37:131156 pathspec), and the message from the original commit is used
1157 as the starting point, instead of an empty message, when no
1158 other message is specified from the command line via options
Junio C Hamanoc14e6ad2014-10-31 20:25:531159 such as <code>-m</code>, <code>-F</code>, <code>-c</code>, etc. The new commit has the same
1160 parents and author as the current one (the <code>--reset-author</code>
Junio C Hamano63b6fdb2013-04-07 23:37:131161 option can countermand this).
Junio C Hamanobfe9e752006-04-05 21:43:281162</p>
Junio C Hamano9d971152012-12-19 00:43:111163<div class="openblock">
1164<div class="content">
Junio C Hamano4eb2b9c2012-11-15 21:12:291165<div class="paragraph"><p>It is a rough equivalent for:</p></div>
1166<div class="listingblock">
1167<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:531168<pre><code> $ git reset --soft HEAD^
Junio C Hamano4eb2b9c2012-11-15 21:12:291169 $ ... do something else to come up with the right tree ...
Junio C Hamanoc14e6ad2014-10-31 20:25:531170 $ git commit -c ORIG_HEAD</code></pre>
Junio C Hamano4eb2b9c2012-11-15 21:12:291171</div></div>
1172<div class="paragraph"><p>but can be used to amend a merge commit.</p></div>
Junio C Hamano9d971152012-12-19 00:43:111173</div></div>
Junio C Hamano4eb2b9c2012-11-15 21:12:291174<div class="paragraph"><p>You should understand the implications of rewriting history if you
1175amend a commit that has already been published. (See the "RECOVERING
1176FROM UPSTREAM REBASE" section in <a href="git-rebase.html">git-rebase(1)</a>.)</p></div>
Junio C Hamano9257a332012-06-25 20:01:021177</dd>
1178<dt class="hdlist1">
1179--no-post-rewrite
1180</dt>
1181<dd>
1182<p>
1183 Bypass the post-rewrite hook.
1184</p>
1185</dd>
Junio C Hamano60186642010-12-02 14:18:261186<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:471187-i
1188</dt>
Junio C Hamano60186642010-12-02 14:18:261189<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:471190--include
Junio C Hamano40f2f8d2006-02-07 08:04:391191</dt>
1192<dd>
1193<p>
Junio C Hamanoe7935c42006-12-13 21:32:171194 Before making a commit out of staged contents so far,
1195 stage the contents of paths given on the command line
1196 as well. This is usually not what you want unless you
1197 are concluding a conflicted merge.
Junio C Hamano6697ac52006-02-14 08:00:231198</p>
1199</dd>
Junio C Hamano60186642010-12-02 14:18:261200<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:471201-o
1202</dt>
Junio C Hamano60186642010-12-02 14:18:261203<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:471204--only
Junio C Hamanoe79159d2008-04-12 08:23:171205</dt>
1206<dd>
1207<p>
Junio C Hamano19a0f4e2014-11-18 21:46:361208 Make a commit by taking the updated working tree contents
1209 of the paths specified on the
Junio C Hamanoe79159d2008-04-12 08:23:171210 command line, disregarding any contents that have been
Junio C Hamano19a0f4e2014-11-18 21:46:361211 staged for other paths. This is the default mode of operation of
Junio C Hamano1aa40d22010-01-21 17:46:431212 <em>git commit</em> if any paths are given on the command line,
Junio C Hamanoe79159d2008-04-12 08:23:171213 in which case this option can be omitted.
1214 If this option is specified together with <em>--amend</em>, then
Junio C Hamano54bf1e22008-12-20 06:30:111215 no paths need to be specified, which can be used to amend
Junio C Hamanoe79159d2008-04-12 08:23:171216 the last commit without committing changes that have
1217 already been staged.
1218</p>
1219</dd>
Junio C Hamano60186642010-12-02 14:18:261220<dt class="hdlist1">
Junio C Hamano4224f992008-06-23 07:14:081221-u[&lt;mode&gt;]
Junio C Hamanoeb415992008-06-08 22:49:471222</dt>
Junio C Hamano60186642010-12-02 14:18:261223<dt class="hdlist1">
Junio C Hamano4224f992008-06-23 07:14:081224--untracked-files[=&lt;mode&gt;]
Junio C Hamano1e6e0062007-07-13 05:33:251225</dt>
1226<dd>
1227<p>
Junio C Hamano36a4dbc2011-02-22 07:51:321228 Show untracked files.
Junio C Hamano1e6e0062007-07-13 05:33:251229</p>
Junio C Hamano36a4dbc2011-02-22 07:51:321230<div class="paragraph"><p>The mode parameter is optional (defaults to <em>all</em>), and is used to
1231specify the handling of untracked files; when -u is not used, the
1232default is <em>normal</em>, i.e. show untracked files and directories.</p></div>
Junio C Hamano60186642010-12-02 14:18:261233<div class="paragraph"><p>The possible options are:</p></div>
1234<div class="ulist"><ul>
Junio C Hamano4224f992008-06-23 07:14:081235<li>
1236<p>
1237<em>no</em> - Show no untracked files
1238</p>
1239</li>
1240<li>
1241<p>
1242<em>normal</em> - Shows untracked files and directories
1243</p>
1244</li>
1245<li>
1246<p>
1247<em>all</em> - Also shows individual files in untracked directories.
1248</p>
Junio C Hamano36a4dbc2011-02-22 07:51:321249<div class="paragraph"><p>The default can be changed using the status.showUntrackedFiles
Junio C Hamanoa28a9202012-06-21 07:08:231250configuration variable documented in <a href="git-config.html">git-config(1)</a>.</p></div>
Junio C Hamanoe1cca182010-02-20 20:01:231251</li>
1252</ul></div>
Junio C Hamano1e6e0062007-07-13 05:33:251253</dd>
Junio C Hamano60186642010-12-02 14:18:261254<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:471255-v
1256</dt>
Junio C Hamano60186642010-12-02 14:18:261257<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:471258--verbose
Junio C Hamano1e6e0062007-07-13 05:33:251259</dt>
1260<dd>
1261<p>
1262 Show unified diff between the HEAD commit and what
1263 would be committed at the bottom of the commit message
Junio C Hamanoe1b28592015-05-19 21:26:171264 template to help the user describe the commit by reminding
1265 what changes the commit has.
1266 Note that this diff output doesn&#8217;t have its
1267 lines prefixed with <em>#</em>. This diff will not be a part
1268 of the commit message.
Junio C Hamano1e6e0062007-07-13 05:33:251269</p>
Junio C Hamano5992a252015-03-17 23:39:301270<div class="paragraph"><p>If specified twice, show in addition the unified diff between
1271what would be committed and the worktree files, i.e. the unstaged
1272changes to tracked files.</p></div>
Junio C Hamano1e6e0062007-07-13 05:33:251273</dd>
Junio C Hamano60186642010-12-02 14:18:261274<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:471275-q
1276</dt>
Junio C Hamano60186642010-12-02 14:18:261277<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:471278--quiet
Junio C Hamano7d23f5e2006-12-16 07:44:041279</dt>
1280<dd>
1281<p>
Junio C Hamanof9771f62007-01-17 17:42:301282 Suppress commit summary message.
Junio C Hamano7d23f5e2006-12-16 07:44:041283</p>
1284</dd>
Junio C Hamano60186642010-12-02 14:18:261285<dt class="hdlist1">
Junio C Hamano1bb31992009-08-29 04:24:081286--dry-run
1287</dt>
1288<dd>
1289<p>
1290 Do not create a commit, but show a list of paths that are
1291 to be committed, paths with local changes that will be left
1292 uncommitted and paths that are untracked.
1293</p>
1294</dd>
Junio C Hamano60186642010-12-02 14:18:261295<dt class="hdlist1">
Junio C Hamano6ce6b6c2010-01-18 01:25:501296--status
1297</dt>
1298<dd>
1299<p>
Junio C Hamanoa28a9202012-06-21 07:08:231300 Include the output of <a href="git-status.html">git-status(1)</a> in the commit
Junio C Hamano6ce6b6c2010-01-18 01:25:501301 message template when using an editor to prepare the commit
1302 message. Defaults to on, but can be used to override
1303 configuration variable commit.status.
1304</p>
1305</dd>
Junio C Hamano60186642010-12-02 14:18:261306<dt class="hdlist1">
Junio C Hamano6ce6b6c2010-01-18 01:25:501307--no-status
1308</dt>
1309<dd>
1310<p>
Junio C Hamanoa28a9202012-06-21 07:08:231311 Do not include the output of <a href="git-status.html">git-status(1)</a> in the
Junio C Hamano6ce6b6c2010-01-18 01:25:501312 commit message template when using an editor to prepare the
1313 default commit message.
1314</p>
1315</dd>
Junio C Hamano60186642010-12-02 14:18:261316<dt class="hdlist1">
Junio C Hamanoa1295452012-11-13 22:32:041317-S[&lt;keyid&gt;]
1318</dt>
1319<dt class="hdlist1">
1320--gpg-sign[=&lt;keyid&gt;]
1321</dt>
1322<dd>
1323<p>
Junio C Hamano1eb56092015-10-05 20:39:531324 GPG-sign commits. The <code>keyid</code> argument is optional and
1325 defaults to the committer identity; if specified, it must be
1326 stuck to the option without a space.
Junio C Hamanoa1295452012-11-13 22:32:041327</p>
1328</dd>
1329<dt class="hdlist1">
Junio C Hamano5b3533d2014-02-27 23:07:151330--no-gpg-sign
1331</dt>
1332<dd>
1333<p>
Junio C Hamano322c6242015-03-23 21:32:461334 Countermand <code>commit.gpgSign</code> configuration variable that is
Junio C Hamano5b3533d2014-02-27 23:07:151335 set to force each and every commit to be signed.
1336</p>
1337</dd>
1338<dt class="hdlist1">
Junio C Hamano1bb569e2006-05-05 23:14:251339--
Junio C Hamano1a4e8412005-12-27 08:17:231340</dt>
1341<dd>
1342<p>
1343 Do not interpret any more arguments as options.
1344</p>
1345</dd>
Junio C Hamano60186642010-12-02 14:18:261346<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:231347&lt;file&gt;&#8230;
1348</dt>
1349<dd>
1350<p>
Junio C Hamanoe7935c42006-12-13 21:32:171351 When files are given on the command line, the command
1352 commits the contents of the named files, without
1353 recording the changes already staged. The contents of
1354 these files are also staged for the next commit on top
1355 of what have been staged before.
Junio C Hamano1a4e8412005-12-27 08:17:231356</p>
1357</dd>
Junio C Hamanoba4b9282008-07-06 05:20:311358</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:231359</div>
Junio C Hamano9d971152012-12-19 00:43:111360</div>
1361<div class="sect1">
Junio C Hamanoae05fee2010-01-08 07:39:461362<h2 id="_date_formats">DATE FORMATS</h2>
1363<div class="sectionbody">
Junio C Hamano60186642010-12-02 14:18:261364<div class="paragraph"><p>The GIT_AUTHOR_DATE, GIT_COMMITTER_DATE environment variables
Junio C Hamanoc14e6ad2014-10-31 20:25:531365and the <code>--date</code> option
Junio C Hamanoae05fee2010-01-08 07:39:461366support the following date formats:</p></div>
Junio C Hamano60186642010-12-02 14:18:261367<div class="dlist"><dl>
1368<dt class="hdlist1">
Junio C Hamanoae05fee2010-01-08 07:39:461369Git internal format
1370</dt>
1371<dd>
1372<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:531373 It is <code>&lt;unix timestamp&gt; &lt;time zone offset&gt;</code>, where <code>&lt;unix
1374 timestamp&gt;</code> is the number of seconds since the UNIX epoch.
1375 <code>&lt;time zone offset&gt;</code> is a positive or negative offset from UTC.
1376 For example CET (which is 2 hours ahead UTC) is <code>+0200</code>.
Junio C Hamanoae05fee2010-01-08 07:39:461377</p>
1378</dd>
Junio C Hamano60186642010-12-02 14:18:261379<dt class="hdlist1">
Junio C Hamanoae05fee2010-01-08 07:39:461380RFC 2822
1381</dt>
1382<dd>
1383<p>
1384 The standard email format as described by RFC 2822, for example
Junio C Hamanoc14e6ad2014-10-31 20:25:531385 <code>Thu, 07 Apr 2005 22:13:13 +0200</code>.
Junio C Hamanoae05fee2010-01-08 07:39:461386</p>
1387</dd>
Junio C Hamano60186642010-12-02 14:18:261388<dt class="hdlist1">
Junio C Hamanoae05fee2010-01-08 07:39:461389ISO 8601
1390</dt>
1391<dd>
1392<p>
1393 Time and date specified by the ISO 8601 standard, for example
Junio C Hamanoc14e6ad2014-10-31 20:25:531394 <code>2005-04-07T22:13:13</code>. The parser accepts a space instead of the
1395 <code>T</code> character as well.
Junio C Hamanoae05fee2010-01-08 07:39:461396</p>
1397<div class="admonitionblock">
1398<table><tr>
1399<td class="icon">
1400<div class="title">Note</div>
1401</td>
1402<td class="content">In addition, the date part is accepted in the following formats:
Junio C Hamanoc14e6ad2014-10-31 20:25:531403<code>YYYY.MM.DD</code>, <code>MM/DD/YYYY</code> and <code>DD.MM.YYYY</code>.</td>
Junio C Hamanoae05fee2010-01-08 07:39:461404</tr></table>
1405</div>
1406</dd>
1407</dl></div>
1408</div>
Junio C Hamano9d971152012-12-19 00:43:111409</div>
1410<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:311411<h2 id="_examples">EXAMPLES</h2>
Junio C Hamano40f2f8d2006-02-07 08:04:391412<div class="sectionbody">
Junio C Hamano60186642010-12-02 14:18:261413<div class="paragraph"><p>When recording your own work, the contents of modified files in
Junio C Hamanoe7935c42006-12-13 21:32:171414your working tree are temporarily stored to a staging area
Junio C Hamano1aa40d22010-01-21 17:46:431415called the "index" with <em>git add</em>. A file can be
Junio C Hamano361c1332007-11-14 12:17:221416reverted back, only in the index but not in the working tree,
Junio C Hamanoc14e6ad2014-10-31 20:25:531417to that of the last commit with <code>git reset HEAD -- &lt;file&gt;</code>,
Junio C Hamano1aa40d22010-01-21 17:46:431418which effectively reverts <em>git add</em> and prevents the changes to
Junio C Hamano361c1332007-11-14 12:17:221419this file from participating in the next commit. After building
1420the state to be committed incrementally with these commands,
Junio C Hamanoc14e6ad2014-10-31 20:25:531421<code>git commit</code> (without any pathname parameter) is used to record what
Junio C Hamanoe7935c42006-12-13 21:32:171422has been staged so far. This is the most basic form of the
Junio C Hamanoba4b9282008-07-06 05:20:311423command. An example:</p></div>
Junio C Hamanoe7935c42006-12-13 21:32:171424<div class="listingblock">
Junio C Hamano40f2f8d2006-02-07 08:04:391425<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:531426<pre><code>$ edit hello.c
Junio C Hamanoe7935c42006-12-13 21:32:171427$ git rm goodbye.c
1428$ git add hello.c
Junio C Hamanoc14e6ad2014-10-31 20:25:531429$ git commit</code></pre>
Junio C Hamano40f2f8d2006-02-07 08:04:391430</div></div>
Junio C Hamano60186642010-12-02 14:18:261431<div class="paragraph"><p>Instead of staging files after each individual change, you can
Junio C Hamanoc14e6ad2014-10-31 20:25:531432tell <code>git commit</code> to notice the changes to the files whose
Junio C Hamanoe7935c42006-12-13 21:32:171433contents are tracked in
Junio C Hamanoc14e6ad2014-10-31 20:25:531434your working tree and do corresponding <code>git add</code> and <code>git rm</code>
Junio C Hamanoe7935c42006-12-13 21:32:171435for you. That is, this example does the same as the earlier
Junio C Hamanoba4b9282008-07-06 05:20:311436example if there is no other change in your working tree:</p></div>
Junio C Hamanoe7935c42006-12-13 21:32:171437<div class="listingblock">
1438<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:531439<pre><code>$ edit hello.c
Junio C Hamanoe7935c42006-12-13 21:32:171440$ rm goodbye.c
Junio C Hamanoc14e6ad2014-10-31 20:25:531441$ git commit -a</code></pre>
Junio C Hamanoe7935c42006-12-13 21:32:171442</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:531443<div class="paragraph"><p>The command <code>git commit -a</code> first looks at your working tree,
Junio C Hamanoe7935c42006-12-13 21:32:171444notices that you have modified hello.c and removed goodbye.c,
Junio C Hamanoc14e6ad2014-10-31 20:25:531445and performs necessary <code>git add</code> and <code>git rm</code> for you.</p></div>
Junio C Hamano60186642010-12-02 14:18:261446<div class="paragraph"><p>After staging changes to many files, you can alter the order the
Junio C Hamanoc14e6ad2014-10-31 20:25:531447changes are recorded in, by giving pathnames to <code>git commit</code>.
Junio C Hamanoe7935c42006-12-13 21:32:171448When pathnames are given, the command makes a commit that
Junio C Hamanoba4b9282008-07-06 05:20:311449only records the changes made to the named paths:</p></div>
Junio C Hamanoe7935c42006-12-13 21:32:171450<div class="listingblock">
1451<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:531452<pre><code>$ edit hello.c hello.h
Junio C Hamanoe7935c42006-12-13 21:32:171453$ git add hello.c hello.h
1454$ edit Makefile
Junio C Hamanoc14e6ad2014-10-31 20:25:531455$ git commit Makefile</code></pre>
Junio C Hamanoe7935c42006-12-13 21:32:171456</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:531457<div class="paragraph"><p>This makes a commit that records the modification to <code>Makefile</code>.
1458The changes staged for <code>hello.c</code> and <code>hello.h</code> are not included
Junio C Hamano60186642010-12-02 14:18:261459in the resulting commit. However, their changes are not lost&#8201;&#8212;&#8201;they are still staged and merely held back. After the above
Junio C Hamanoba4b9282008-07-06 05:20:311460sequence, if you do:</p></div>
Junio C Hamanoe7935c42006-12-13 21:32:171461<div class="listingblock">
1462<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:531463<pre><code>$ git commit</code></pre>
Junio C Hamanoe7935c42006-12-13 21:32:171464</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:531465<div class="paragraph"><p>this second commit would record the changes to <code>hello.c</code> and
1466<code>hello.h</code> as expected.</p></div>
Junio C Hamano60186642010-12-02 14:18:261467<div class="paragraph"><p>After a merge (initiated by <em>git merge</em> or <em>git pull</em>) stops
Junio C Hamanofce7c7e2008-07-02 03:06:381468because of conflicts, cleanly merged
Junio C Hamanoe7935c42006-12-13 21:32:171469paths are already staged to be committed for you, and paths that
1470conflicted are left in unmerged state. You would have to first
Junio C Hamano1aa40d22010-01-21 17:46:431471check which paths are conflicting with <em>git status</em>
Junio C Hamanoe7935c42006-12-13 21:32:171472and after fixing them manually in your working tree, you would
Junio C Hamano1aa40d22010-01-21 17:46:431473stage the result as usual with <em>git add</em>:</p></div>
Junio C Hamanoe7935c42006-12-13 21:32:171474<div class="listingblock">
1475<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:531476<pre><code>$ git status | grep unmerged
Junio C Hamanoe7935c42006-12-13 21:32:171477unmerged: hello.c
1478$ edit hello.c
Junio C Hamanoc14e6ad2014-10-31 20:25:531479$ git add hello.c</code></pre>
Junio C Hamanoe7935c42006-12-13 21:32:171480</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:531481<div class="paragraph"><p>After resolving conflicts and staging the result, <code>git ls-files -u</code>
Junio C Hamanoe7935c42006-12-13 21:32:171482would stop mentioning the conflicted path. When you are done,
Junio C Hamanoc14e6ad2014-10-31 20:25:531483run <code>git commit</code> to finally record the merge:</p></div>
Junio C Hamanoe7935c42006-12-13 21:32:171484<div class="listingblock">
1485<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:531486<pre><code>$ git commit</code></pre>
Junio C Hamanoe7935c42006-12-13 21:32:171487</div></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:531488<div class="paragraph"><p>As with the case to record your own changes, you can use <code>-a</code>
Junio C Hamanoe7935c42006-12-13 21:32:171489option to save typing. One difference is that during a merge
Junio C Hamanoc14e6ad2014-10-31 20:25:531490resolution, you cannot use <code>git commit</code> with pathnames to
Junio C Hamanoe7935c42006-12-13 21:32:171491alter the order the changes are committed, because the merge
1492should be recorded as a single commit. In fact, the command
Junio C Hamanoc14e6ad2014-10-31 20:25:531493refuses to run when given pathnames (but see <code>-i</code> option).</p></div>
Junio C Hamanoe7935c42006-12-13 21:32:171494</div>
Junio C Hamano9d971152012-12-19 00:43:111495</div>
1496<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:311497<h2 id="_discussion">DISCUSSION</h2>
Junio C Hamano775a0f42006-12-31 01:19:141498<div class="sectionbody">
Junio C Hamano60186642010-12-02 14:18:261499<div class="paragraph"><p>Though not required, it&#8217;s a good idea to begin the commit message
Junio C Hamano8f76dc62007-01-17 07:24:251500with a single short (less than 50 character) line summarizing the
1501change, followed by a blank line and then a more thorough description.
Junio C Hamano281fd392012-09-17 23:57:411502The text up to the first blank line in a commit message is treated
Junio C Hamano076ffcc2013-02-06 05:13:211503as the commit title, and that title is used throughout Git.
Junio C Hamano281fd392012-09-17 23:57:411504For example, <a href="git-format-patch.html">git-format-patch(1)</a> turns a commit into email, and it uses
1505the title on the Subject line and the rest of the commit in the body.</p></div>
Junio C Hamanod7ed4042015-08-03 19:43:001506<div class="paragraph"><p>Git is to some extent character encoding agnostic.</p></div>
Junio C Hamano60186642010-12-02 14:18:261507<div class="ulist"><ul>
Junio C Hamano775a0f42006-12-31 01:19:141508<li>
1509<p>
Junio C Hamano54bf1e22008-12-20 06:30:111510The contents of the blob objects are uninterpreted sequences
Junio C Hamano775a0f42006-12-31 01:19:141511 of bytes. There is no encoding translation at the core
1512 level.
1513</p>
1514</li>
1515<li>
1516<p>
Junio C Hamanod7ed4042015-08-03 19:43:001517Path names are encoded in UTF-8 normalization form C. This
1518 applies to tree objects, the index file, ref names, as well as
1519 path names in command line arguments, environment variables
1520 and config files (<code>.git/config</code> (see <a href="git-config.html">git-config(1)</a>),
1521 <a href="gitignore.html">gitignore(5)</a>, <a href="gitattributes.html">gitattributes(5)</a> and
1522 <a href="gitmodules.html">gitmodules(5)</a>).
1523</p>
1524<div class="paragraph"><p>Note that Git at the core level treats path names simply as
1525sequences of non-NUL bytes, there are no path name encoding
1526conversions (except on Mac and Windows). Therefore, using
1527non-ASCII path names will mostly work even on platforms and file
1528systems that use legacy extended ASCII encodings. However,
1529repositories created on such systems will not work properly on
1530UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa.
1531Additionally, many Git-based tools simply assume path names to
1532be UTF-8 and will fail to display other encodings correctly.</p></div>
1533</li>
1534<li>
1535<p>
1536Commit log messages are typically encoded in UTF-8, but other
1537 extended ASCII encodings are also supported. This includes
1538 ISO-8859-x, CP125x and many others, but <em>not</em> UTF-16/32,
1539 EBCDIC and CJK multi-byte encodings (GBK, Shift-JIS, Big5,
1540 EUC-x, CP9xx etc.).
Junio C Hamano775a0f42006-12-31 01:19:141541</p>
1542</li>
Junio C Hamanoba4b9282008-07-06 05:20:311543</ul></div>
Junio C Hamano60186642010-12-02 14:18:261544<div class="paragraph"><p>Although we encourage that the commit log messages are encoded
Junio C Hamano076ffcc2013-02-06 05:13:211545in UTF-8, both the core and Git Porcelain are designed not to
Junio C Hamano775a0f42006-12-31 01:19:141546force UTF-8 on projects. If all participants of a particular
Junio C Hamano076ffcc2013-02-06 05:13:211547project find it more convenient to use legacy encodings, Git
Junio C Hamano775a0f42006-12-31 01:19:141548does not forbid it. However, there are a few things to keep in
Junio C Hamanoba4b9282008-07-06 05:20:311549mind.</p></div>
Junio C Hamano60186642010-12-02 14:18:261550<div class="olist arabic"><ol class="arabic">
Junio C Hamano775a0f42006-12-31 01:19:141551<li>
1552<p>
Junio C Hamano1aa40d22010-01-21 17:46:431553<em>git commit</em> and <em>git commit-tree</em> issues
Junio C Hamano14b76482008-01-05 10:32:261554 a warning if the commit log message given to it does not look
Junio C Hamano775a0f42006-12-31 01:19:141555 like a valid UTF-8 string, unless you explicitly say your
1556 project uses a legacy encoding. The way to say this is to
Junio C Hamanoc14e6ad2014-10-31 20:25:531557 have i18n.commitencoding in <code>.git/config</code> file, like this:
Junio C Hamano775a0f42006-12-31 01:19:141558</p>
1559<div class="listingblock">
1560<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:531561<pre><code>[i18n]
1562 commitencoding = ISO-8859-1</code></pre>
Junio C Hamano775a0f42006-12-31 01:19:141563</div></div>
Junio C Hamano60186642010-12-02 14:18:261564<div class="paragraph"><p>Commit objects created with the above setting record the value
Junio C Hamanoc14e6ad2014-10-31 20:25:531565of <code>i18n.commitencoding</code> in its <code>encoding</code> header. This is to
Junio C Hamano775a0f42006-12-31 01:19:141566help other people who look at them later. Lack of this header
Junio C Hamanoba4b9282008-07-06 05:20:311567implies that the commit log message is encoded in UTF-8.</p></div>
Junio C Hamano775a0f42006-12-31 01:19:141568</li>
1569<li>
1570<p>
Junio C Hamano1aa40d22010-01-21 17:46:431571<em>git log</em>, <em>git show</em>, <em>git blame</em> and friends look at the
Junio C Hamanoc14e6ad2014-10-31 20:25:531572 <code>encoding</code> header of a commit object, and try to re-code the
Junio C Hamanoaa17c7c2008-11-03 04:36:581573 log message into UTF-8 unless otherwise specified. You can
Junio C Hamano775a0f42006-12-31 01:19:141574 specify the desired output encoding with
Junio C Hamanoc14e6ad2014-10-31 20:25:531575 <code>i18n.logoutputencoding</code> in <code>.git/config</code> file, like this:
Junio C Hamano775a0f42006-12-31 01:19:141576</p>
1577<div class="listingblock">
1578<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:531579<pre><code>[i18n]
1580 logoutputencoding = ISO-8859-1</code></pre>
Junio C Hamano775a0f42006-12-31 01:19:141581</div></div>
Junio C Hamano60186642010-12-02 14:18:261582<div class="paragraph"><p>If you do not have this configuration variable, the value of
Junio C Hamanoc14e6ad2014-10-31 20:25:531583<code>i18n.commitencoding</code> is used instead.</p></div>
Junio C Hamano775a0f42006-12-31 01:19:141584</li>
Junio C Hamanoba4b9282008-07-06 05:20:311585</ol></div>
Junio C Hamano60186642010-12-02 14:18:261586<div class="paragraph"><p>Note that we deliberately chose not to re-code the commit log
Junio C Hamano775a0f42006-12-31 01:19:141587message when a commit is made to force UTF-8 at the commit
1588object level, because re-coding to UTF-8 is not necessarily a
Junio C Hamanoba4b9282008-07-06 05:20:311589reversible operation.</p></div>
Junio C Hamano775a0f42006-12-31 01:19:141590</div>
Junio C Hamano9d971152012-12-19 00:43:111591</div>
1592<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:311593<h2 id="_environment_and_configuration_variables">ENVIRONMENT AND CONFIGURATION VARIABLES</h2>
Junio C Hamanoe7935c42006-12-13 21:32:171594<div class="sectionbody">
Junio C Hamano60186642010-12-02 14:18:261595<div class="paragraph"><p>The editor used to edit the commit log message will be chosen from the
Junio C Hamanof6002a92007-07-20 10:28:221596GIT_EDITOR environment variable, the core.editor configuration variable, the
1597VISUAL environment variable, or the EDITOR environment variable (in that
Junio C Hamanoa28a9202012-06-21 07:08:231598order). See <a href="git-var.html">git-var(1)</a> for details.</p></div>
Junio C Hamanoe7935c42006-12-13 21:32:171599</div>
Junio C Hamano9d971152012-12-19 00:43:111600</div>
1601<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:311602<h2 id="_hooks">HOOKS</h2>
Junio C Hamanoe7935c42006-12-13 21:32:171603<div class="sectionbody">
Junio C Hamanoc14e6ad2014-10-31 20:25:531604<div class="paragraph"><p>This command can run <code>commit-msg</code>, <code>prepare-commit-msg</code>, <code>pre-commit</code>,
1605and <code>post-commit</code> hooks. See <a href="githooks.html">githooks(5)</a> for more
Junio C Hamanoba4b9282008-07-06 05:20:311606information.</p></div>
Junio C Hamanoe7935c42006-12-13 21:32:171607</div>
Junio C Hamano9d971152012-12-19 00:43:111608</div>
1609<div class="sect1">
Junio C Hamano28a85be2012-07-24 22:05:151610<h2 id="_files">FILES</h2>
1611<div class="sectionbody">
1612<div class="dlist"><dl>
1613<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:531614<code>$GIT_DIR/COMMIT_EDITMSG</code>
Junio C Hamano28a85be2012-07-24 22:05:151615</dt>
1616<dd>
1617<p>
1618 This file contains the commit message of a commit in progress.
Junio C Hamanoc14e6ad2014-10-31 20:25:531619 If <code>git commit</code> exits due to an error before creating a commit,
Junio C Hamano28a85be2012-07-24 22:05:151620 any commit message that has been provided by the user (e.g., in
1621 an editor session) will be available in this file, but will be
Junio C Hamanoc14e6ad2014-10-31 20:25:531622 overwritten by the next invocation of <code>git commit</code>.
Junio C Hamano28a85be2012-07-24 22:05:151623</p>
1624</dd>
1625</dl></div>
1626</div>
Junio C Hamano9d971152012-12-19 00:43:111627</div>
1628<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:311629<h2 id="_see_also">SEE ALSO</h2>
Junio C Hamanoe7935c42006-12-13 21:32:171630<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:231631<div class="paragraph"><p><a href="git-add.html">git-add(1)</a>,
1632<a href="git-rm.html">git-rm(1)</a>,
1633<a href="git-mv.html">git-mv(1)</a>,
1634<a href="git-merge.html">git-merge(1)</a>,
1635<a href="git-commit-tree.html">git-commit-tree(1)</a></p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:391636</div>
Junio C Hamano9d971152012-12-19 00:43:111637</div>
1638<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:311639<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:231640<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:231641<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:231642</div>
Junio C Hamano7bd050f2011-09-22 06:32:221643</div>
Junio C Hamano9d971152012-12-19 00:43:111644</div>
Junio C Hamano7bd050f2011-09-22 06:32:221645<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:231646<div id="footer">
1647<div id="footer-text">
Junio C Hamano1eb56092015-10-05 20:39:531648Last updated 2015-10-05 13:38:43 PDT
Junio C Hamano1a4e8412005-12-27 08:17:231649</div>
1650</div>
1651</body>
1652</html>