blob: 8109f7e5f05c44863ec6b45a2b3f15320317e502 [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" />
6<meta name="generator" content="AsciiDoc 8.6.8" />
Junio C Hamano103b5722011-01-31 05:03:457<title>git-status(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 Hamano103b5722011-01-31 05:03:4540 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:2341}
42
43strong {
44 font-weight: bold;
Junio C Hamano103b5722011-01-31 05:03:4545 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 Hamano103b5722011-01-31 05:03:4584ul, 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 Hamano103b5722011-01-31 05:03:4589
Junio C Hamano9d971152012-12-19 00:43:1190.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}
97
Junio C Hamano9d971152012-12-19 00:43:1198
99#author {
Junio C Hamano1a4e8412005-12-27 08:17:23100 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23101 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31102 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23103}
Junio C Hamano9d971152012-12-19 00:43:11104#email {
Junio C Hamano1a4e8412005-12-27 08:17:23105}
Junio C Hamano9d971152012-12-19 00:43:11106#revnumber, #revdate, #revremark {
Junio C Hamano1a4e8412005-12-27 08:17:23107}
108
Junio C Hamano9d971152012-12-19 00:43:11109#footer {
Junio C Hamano1a4e8412005-12-27 08:17:23110 font-size: small;
111 border-top: 2px solid silver;
112 padding-top: 0.5em;
113 margin-top: 4.0em;
114}
Junio C Hamano9d971152012-12-19 00:43:11115#footer-text {
Junio C Hamano1a4e8412005-12-27 08:17:23116 float: left;
117 padding-bottom: 0.5em;
118}
Junio C Hamano9d971152012-12-19 00:43:11119#footer-badges {
Junio C Hamano1a4e8412005-12-27 08:17:23120 float: right;
121 padding-bottom: 0.5em;
122}
123
Junio C Hamano9d971152012-12-19 00:43:11124#preamble {
Junio C Hamano103b5722011-01-31 05:03:45125 margin-top: 1.5em;
126 margin-bottom: 1.5em;
127}
Junio C Hamano9d971152012-12-19 00:43:11128div.imageblock, div.exampleblock, div.verseblock,
Junio C Hamano1a4e8412005-12-27 08:17:23129div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
130div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22131 margin-top: 1.0em;
Junio C Hamano1a4e8412005-12-27 08:17:23132 margin-bottom: 1.5em;
133}
134div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22135 margin-top: 2.0em;
136 margin-bottom: 2.0em;
137 margin-right: 10%;
138 color: #606060;
Junio C Hamano1a4e8412005-12-27 08:17:23139}
140
141div.content { /* Block element content. */
142 padding: 0;
143}
144
145/* Block element titles. */
146div.title, caption.title {
Junio C Hamano103b5722011-01-31 05:03:45147 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23148 font-weight: bold;
149 text-align: left;
150 margin-top: 1.0em;
151 margin-bottom: 0.5em;
152}
153div.title + * {
154 margin-top: 0;
155}
156
157td div.title:first-child {
158 margin-top: 0.0em;
159}
160div.content div.title:first-child {
161 margin-top: 0.0em;
162}
163div.content + div.title {
164 margin-top: 0.0em;
165}
166
167div.sidebarblock > div.content {
168 background: #ffffee;
Junio C Hamano9d971152012-12-19 00:43:11169 border: 1px solid #dddddd;
170 border-left: 4px solid #f0f0f0;
Junio C Hamano1a4e8412005-12-27 08:17:23171 padding: 0.5em;
172}
173
174div.listingblock > div.content {
Junio C Hamano9d971152012-12-19 00:43:11175 border: 1px solid #dddddd;
176 border-left: 5px solid #f0f0f0;
177 background: #f8f8f8;
Junio C Hamano1a4e8412005-12-27 08:17:23178 padding: 0.5em;
179}
180
Junio C Hamano7bd050f2011-09-22 06:32:22181div.quoteblock, div.verseblock {
182 padding-left: 1.0em;
183 margin-left: 1.0em;
Junio C Hamano103b5722011-01-31 05:03:45184 margin-right: 10%;
Junio C Hamano9d971152012-12-19 00:43:11185 border-left: 5px solid #f0f0f0;
186 color: #888;
Junio C Hamano1a4e8412005-12-27 08:17:23187}
Junio C Hamano7bd050f2011-09-22 06:32:22188
Junio C Hamano103b5722011-01-31 05:03:45189div.quoteblock > div.attribution {
190 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23191 text-align: right;
192}
Junio C Hamano103b5722011-01-31 05:03:45193
Junio C Hamano9d971152012-12-19 00:43:11194div.verseblock > pre.content {
195 font-family: inherit;
196 font-size: inherit;
Junio C Hamano103b5722011-01-31 05:03:45197}
198div.verseblock > div.attribution {
199 padding-top: 0.75em;
200 text-align: left;
201}
202/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31203div.verseblock + div.attribution {
204 text-align: left;
205}
Junio C Hamano1a4e8412005-12-27 08:17:23206
207div.admonitionblock .icon {
208 vertical-align: top;
209 font-size: 1.1em;
210 font-weight: bold;
211 text-decoration: underline;
212 color: #527bbd;
213 padding-right: 0.5em;
214}
215div.admonitionblock td.content {
216 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22217 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23218}
219
220div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22221 border-left: 3px solid #dddddd;
222 padding-left: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23223}
224
Junio C Hamano1a4e8412005-12-27 08:17:23225div.imageblock div.content { padding-left: 0; }
Junio C Hamano1a4e8412005-12-27 08:17:23226span.image img { border-style: none; }
Junio C Hamano103b5722011-01-31 05:03:45227a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23228
229dl {
230 margin-top: 0.8em;
231 margin-bottom: 0.8em;
232}
233dt {
234 margin-top: 0.5em;
235 margin-bottom: 0;
Junio C Hamano103b5722011-01-31 05:03:45236 font-style: normal;
237 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23238}
239dd > *:first-child {
Junio C Hamano103b5722011-01-31 05:03:45240 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23241}
242
243ul, ol {
244 list-style-position: outside;
245}
Junio C Hamano103b5722011-01-31 05:03:45246ol.arabic {
247 list-style-type: decimal;
248}
249ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23250 list-style-type: lower-alpha;
251}
Junio C Hamano103b5722011-01-31 05:03:45252ol.upperalpha {
253 list-style-type: upper-alpha;
254}
255ol.lowerroman {
256 list-style-type: lower-roman;
257}
258ol.upperroman {
259 list-style-type: upper-roman;
260}
261
262div.compact ul, div.compact ol,
263div.compact p, div.compact p,
264div.compact div, div.compact div {
265 margin-top: 0.1em;
266 margin-bottom: 0.1em;
267}
Junio C Hamano1a4e8412005-12-27 08:17:23268
Junio C Hamano1a4e8412005-12-27 08:17:23269tfoot {
270 font-weight: bold;
271}
Junio C Hamano103b5722011-01-31 05:03:45272td > div.verse {
273 white-space: pre;
274}
Junio C Hamano103b5722011-01-31 05:03:45275
276div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23277 margin-top: 0.8em;
278 margin-bottom: 0.8em;
279}
Junio C Hamano103b5722011-01-31 05:03:45280div.hdlist tr {
281 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31282}
Junio C Hamano103b5722011-01-31 05:03:45283dt.hdlist1.strong, td.hdlist1.strong {
284 font-weight: bold;
285}
286td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23287 vertical-align: top;
Junio C Hamano103b5722011-01-31 05:03:45288 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23289 padding-right: 0.8em;
Junio C Hamano103b5722011-01-31 05:03:45290 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23291}
Junio C Hamano103b5722011-01-31 05:03:45292td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23293 vertical-align: top;
294}
Junio C Hamano103b5722011-01-31 05:03:45295div.hdlist.compact tr {
296 margin: 0;
297 padding-bottom: 0;
298}
299
300.comment {
301 background: yellow;
302}
Junio C Hamano1a4e8412005-12-27 08:17:23303
Junio C Hamano7bd050f2011-09-22 06:32:22304.footnote, .footnoteref {
305 font-size: 0.8em;
306}
307
308span.footnote, span.footnoteref {
309 vertical-align: super;
310}
311
312#footnotes {
313 margin: 20px 0 20px 0;
314 padding: 7px 0 0 0;
315}
316
317#footnotes div.footnote {
318 margin: 0 0 5px 0;
319}
320
321#footnotes hr {
322 border: none;
323 border-top: 1px solid silver;
324 height: 1px;
325 text-align: left;
326 margin-left: 0;
327 width: 20%;
328 min-width: 100px;
329}
330
Junio C Hamano9d971152012-12-19 00:43:11331div.colist td {
332 padding-right: 0.5em;
333 padding-bottom: 0.3em;
334 vertical-align: top;
335}
336div.colist td img {
337 margin-top: 0.3em;
Junio C Hamano1a4e8412005-12-27 08:17:23338}
Junio C Hamanoba4b9282008-07-06 05:20:31339
Junio C Hamano9d971152012-12-19 00:43:11340@media print {
341 #footer-badges { display: none; }
342}
343
344#toc {
Junio C Hamano7bd050f2011-09-22 06:32:22345 margin-bottom: 2.5em;
346}
347
Junio C Hamano9d971152012-12-19 00:43:11348#toctitle {
Junio C Hamanoba4b9282008-07-06 05:20:31349 color: #527bbd;
Junio C Hamanoba4b9282008-07-06 05:20:31350 font-size: 1.1em;
351 font-weight: bold;
352 margin-top: 1.0em;
353 margin-bottom: 0.1em;
354}
355
Junio C Hamano9d971152012-12-19 00:43:11356div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
Junio C Hamanoba4b9282008-07-06 05:20:31357 margin-top: 0;
358 margin-bottom: 0;
359}
360div.toclevel2 {
361 margin-left: 2em;
362 font-size: 0.9em;
363}
364div.toclevel3 {
365 margin-left: 4em;
366 font-size: 0.9em;
367}
368div.toclevel4 {
369 margin-left: 6em;
370 font-size: 0.9em;
371}
Junio C Hamano9d971152012-12-19 00:43:11372
373span.aqua { color: aqua; }
374span.black { color: black; }
375span.blue { color: blue; }
376span.fuchsia { color: fuchsia; }
377span.gray { color: gray; }
378span.green { color: green; }
379span.lime { color: lime; }
380span.maroon { color: maroon; }
381span.navy { color: navy; }
382span.olive { color: olive; }
383span.purple { color: purple; }
384span.red { color: red; }
385span.silver { color: silver; }
386span.teal { color: teal; }
387span.white { color: white; }
388span.yellow { color: yellow; }
389
390span.aqua-background { background: aqua; }
391span.black-background { background: black; }
392span.blue-background { background: blue; }
393span.fuchsia-background { background: fuchsia; }
394span.gray-background { background: gray; }
395span.green-background { background: green; }
396span.lime-background { background: lime; }
397span.maroon-background { background: maroon; }
398span.navy-background { background: navy; }
399span.olive-background { background: olive; }
400span.purple-background { background: purple; }
401span.red-background { background: red; }
402span.silver-background { background: silver; }
403span.teal-background { background: teal; }
404span.white-background { background: white; }
405span.yellow-background { background: yellow; }
406
407span.big { font-size: 2em; }
408span.small { font-size: 0.6em; }
409
410span.underline { text-decoration: underline; }
411span.overline { text-decoration: overline; }
412span.line-through { text-decoration: line-through; }
413
414div.unbreakable { page-break-inside: avoid; }
415
416
417/*
418 * xhtml11 specific
419 *
420 * */
421
422div.tableblock {
423 margin-top: 1.0em;
424 margin-bottom: 1.5em;
425}
426div.tableblock > table {
427 border: 3px solid #527bbd;
428}
429thead, p.table.header {
430 font-weight: bold;
431 color: #527bbd;
432}
433p.table {
434 margin-top: 0;
435}
436/* Because the table frame attribute is overriden by CSS in most browsers. */
437div.tableblock > table[frame="void"] {
438 border-style: none;
439}
440div.tableblock > table[frame="hsides"] {
441 border-left-style: none;
442 border-right-style: none;
443}
444div.tableblock > table[frame="vsides"] {
445 border-top-style: none;
446 border-bottom-style: none;
447}
448
449
450/*
451 * html5 specific
452 *
453 * */
454
455table.tableblock {
456 margin-top: 1.0em;
457 margin-bottom: 1.5em;
458}
459thead, p.tableblock.header {
460 font-weight: bold;
461 color: #527bbd;
462}
463p.tableblock {
464 margin-top: 0;
465}
466table.tableblock {
467 border-width: 3px;
468 border-spacing: 0px;
469 border-style: solid;
470 border-color: #527bbd;
471 border-collapse: collapse;
472}
473th.tableblock, td.tableblock {
474 border-width: 1px;
475 padding: 4px;
476 border-style: solid;
477 border-color: #527bbd;
478}
479
480table.tableblock.frame-topbot {
481 border-left-style: hidden;
482 border-right-style: hidden;
483}
484table.tableblock.frame-sides {
485 border-top-style: hidden;
486 border-bottom-style: hidden;
487}
488table.tableblock.frame-none {
489 border-style: hidden;
490}
491
492th.tableblock.halign-left, td.tableblock.halign-left {
493 text-align: left;
494}
495th.tableblock.halign-center, td.tableblock.halign-center {
496 text-align: center;
497}
498th.tableblock.halign-right, td.tableblock.halign-right {
499 text-align: right;
500}
501
502th.tableblock.valign-top, td.tableblock.valign-top {
503 vertical-align: top;
504}
505th.tableblock.valign-middle, td.tableblock.valign-middle {
506 vertical-align: middle;
507}
508th.tableblock.valign-bottom, td.tableblock.valign-bottom {
509 vertical-align: bottom;
510}
511
512
513/*
514 * manpage specific
515 *
516 * */
517
518body.manpage h1 {
Junio C Hamano103b5722011-01-31 05:03:45519 padding-top: 0.5em;
520 padding-bottom: 0.5em;
521 border-top: 2px solid silver;
522 border-bottom: 2px solid silver;
523}
Junio C Hamano9d971152012-12-19 00:43:11524body.manpage h2 {
Junio C Hamano103b5722011-01-31 05:03:45525 border-style: none;
526}
Junio C Hamano9d971152012-12-19 00:43:11527body.manpage div.sectionbody {
528 margin-left: 3em;
Junio C Hamano103b5722011-01-31 05:03:45529}
530
531@media print {
Junio C Hamano9d971152012-12-19 00:43:11532 body.manpage div#toc { display: none; }
Junio C Hamano103b5722011-01-31 05:03:45533}
534
Junio C Hamano1a4e8412005-12-27 08:17:23535
Junio C Hamano1a4e8412005-12-27 08:17:23536</style>
Junio C Hamano7bd050f2011-09-22 06:32:22537<script type="text/javascript">
538/*<![CDATA[*/
Junio C Hamano7bd050f2011-09-22 06:32:22539var asciidoc = { // Namespace.
540
541/////////////////////////////////////////////////////////////////////
542// Table Of Contents generator
543/////////////////////////////////////////////////////////////////////
544
545/* Author: Mihai Bazon, September 2002
546 * http://students.infoiasi.ro/~mishoo
547 *
548 * Table Of Content generator
549 * Version: 0.4
550 *
551 * Feel free to use this script under the terms of the GNU General Public
552 * License, as long as you do not remove or alter this notice.
553 */
554
555 /* modified by Troy D. Hanson, September 2006. License: GPL */
556 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
557
558// toclevels = 1..4.
559toc: function (toclevels) {
560
561 function getText(el) {
562 var text = "";
563 for (var i = el.firstChild; i != null; i = i.nextSibling) {
564 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
565 text += i.data;
566 else if (i.firstChild != null)
567 text += getText(i);
568 }
569 return text;
570 }
571
572 function TocEntry(el, text, toclevel) {
573 this.element = el;
574 this.text = text;
575 this.toclevel = toclevel;
576 }
577
578 function tocEntries(el, toclevels) {
579 var result = new Array;
Junio C Hamano9d971152012-12-19 00:43:11580 var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
Junio C Hamano7bd050f2011-09-22 06:32:22581 // Function that scans the DOM tree for header elements (the DOM2
582 // nodeIterator API would be a better technique but not supported by all
583 // browsers).
584 var iterate = function (el) {
585 for (var i = el.firstChild; i != null; i = i.nextSibling) {
586 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
587 var mo = re.exec(i.tagName);
588 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
589 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
590 }
591 iterate(i);
592 }
593 }
594 }
595 iterate(el);
596 return result;
597 }
598
599 var toc = document.getElementById("toc");
Junio C Hamano9d971152012-12-19 00:43:11600 if (!toc) {
601 return;
602 }
603
604 // Delete existing TOC entries in case we're reloading the TOC.
605 var tocEntriesToRemove = [];
606 var i;
607 for (i = 0; i < toc.childNodes.length; i++) {
608 var entry = toc.childNodes[i];
609 if (entry.nodeName.toLowerCase() == 'div'
610 && entry.getAttribute("class")
611 && entry.getAttribute("class").match(/^toclevel/))
612 tocEntriesToRemove.push(entry);
613 }
614 for (i = 0; i < tocEntriesToRemove.length; i++) {
615 toc.removeChild(tocEntriesToRemove[i]);
616 }
617
618 // Rebuild TOC entries.
Junio C Hamano7bd050f2011-09-22 06:32:22619 var entries = tocEntries(document.getElementById("content"), toclevels);
620 for (var i = 0; i < entries.length; ++i) {
621 var entry = entries[i];
622 if (entry.element.id == "")
623 entry.element.id = "_toc_" + i;
624 var a = document.createElement("a");
625 a.href = "#" + entry.element.id;
626 a.appendChild(document.createTextNode(entry.text));
627 var div = document.createElement("div");
628 div.appendChild(a);
629 div.className = "toclevel" + entry.toclevel;
630 toc.appendChild(div);
631 }
632 if (entries.length == 0)
633 toc.parentNode.removeChild(toc);
634},
635
636
637/////////////////////////////////////////////////////////////////////
638// Footnotes generator
639/////////////////////////////////////////////////////////////////////
640
641/* Based on footnote generation code from:
642 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
643 */
644
645footnotes: function () {
Junio C Hamano9d971152012-12-19 00:43:11646 // Delete existing footnote entries in case we're reloading the footnodes.
647 var i;
Junio C Hamano7bd050f2011-09-22 06:32:22648 var noteholder = document.getElementById("footnotes");
Junio C Hamano9d971152012-12-19 00:43:11649 if (!noteholder) {
650 return;
651 }
652 var entriesToRemove = [];
653 for (i = 0; i < noteholder.childNodes.length; i++) {
654 var entry = noteholder.childNodes[i];
655 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
656 entriesToRemove.push(entry);
657 }
658 for (i = 0; i < entriesToRemove.length; i++) {
659 noteholder.removeChild(entriesToRemove[i]);
660 }
661
662 // Rebuild footnote entries.
663 var cont = document.getElementById("content");
Junio C Hamano7bd050f2011-09-22 06:32:22664 var spans = cont.getElementsByTagName("span");
665 var refs = {};
666 var n = 0;
667 for (i=0; i<spans.length; i++) {
668 if (spans[i].className == "footnote") {
669 n++;
Junio C Hamano9d971152012-12-19 00:43:11670 var note = spans[i].getAttribute("data-note");
671 if (!note) {
672 // Use [\s\S] in place of . so multi-line matches work.
673 // Because JavaScript has no s (dotall) regex flag.
674 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
675 spans[i].innerHTML =
676 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
677 "' title='View footnote' class='footnote'>" + n + "</a>]";
678 spans[i].setAttribute("data-note", note);
679 }
Junio C Hamano7bd050f2011-09-22 06:32:22680 noteholder.innerHTML +=
681 "<div class='footnote' id='_footnote_" + n + "'>" +
682 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
683 n + "</a>. " + note + "</div>";
Junio C Hamano7bd050f2011-09-22 06:32:22684 var id =spans[i].getAttribute("id");
685 if (id != null) refs["#"+id] = n;
686 }
687 }
688 if (n == 0)
689 noteholder.parentNode.removeChild(noteholder);
690 else {
691 // Process footnoterefs.
692 for (i=0; i<spans.length; i++) {
693 if (spans[i].className == "footnoteref") {
694 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
695 href = href.match(/#.*/)[0]; // Because IE return full URL.
696 n = refs[href];
697 spans[i].innerHTML =
698 "[<a href='#_footnote_" + n +
699 "' title='View footnote' class='footnote'>" + n + "</a>]";
700 }
701 }
702 }
Junio C Hamano9d971152012-12-19 00:43:11703},
704
705install: function(toclevels) {
706 var timerId;
707
708 function reinstall() {
709 asciidoc.footnotes();
710 if (toclevels) {
711 asciidoc.toc(toclevels);
712 }
713 }
714
715 function reinstallAndRemoveTimer() {
716 clearInterval(timerId);
717 reinstall();
718 }
719
720 timerId = setInterval(reinstall, 500);
721 if (document.addEventListener)
722 document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
723 else
724 window.onload = reinstallAndRemoveTimer;
Junio C Hamano7bd050f2011-09-22 06:32:22725}
726
727}
Junio C Hamano9d971152012-12-19 00:43:11728asciidoc.install();
Junio C Hamano7bd050f2011-09-22 06:32:22729/*]]>*/
730</script>
Junio C Hamano1a4e8412005-12-27 08:17:23731</head>
Junio C Hamano9d971152012-12-19 00:43:11732<body class="manpage">
Junio C Hamano1a4e8412005-12-27 08:17:23733<div id="header">
734<h1>
735git-status(1) Manual Page
736</h1>
737<h2>NAME</h2>
738<div class="sectionbody">
739<p>git-status -
Junio C Hamano7c73c662007-01-19 00:37:50740 Show the working tree status
Junio C Hamano1a4e8412005-12-27 08:17:23741</p>
742</div>
743</div>
Junio C Hamano7bd050f2011-09-22 06:32:22744<div id="content">
Junio C Hamano9d971152012-12-19 00:43:11745<div class="sect1">
Junio C Hamano103b5722011-01-31 05:03:45746<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23747<div class="sectionbody">
Junio C Hamano15567bc2011-07-23 00:51:59748<div class="verseblock">
Junio C Hamano9d971152012-12-19 00:43:11749<pre class="content"><em>git status</em> [&lt;options&gt;&#8230;] [--] [&lt;pathspec&gt;&#8230;]</pre>
750<div class="attribution">
Junio C Hamano15567bc2011-07-23 00:51:59751</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23752</div>
Junio C Hamano9d971152012-12-19 00:43:11753</div>
754<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31755<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23756<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45757<div class="paragraph"><p>Displays paths that have differences between the index file and the
Junio C Hamano942b35e2007-12-09 10:19:33758current HEAD commit, paths that have differences between the working
759tree and the index file, and paths in the working tree that are not
Junio C Hamanoa28a9202012-06-21 07:08:23760tracked by git (and are not ignored by <a href="gitignore.html">gitignore(5)</a>). The first
Junio C Hamano9d971152012-12-19 00:43:11761are what you <em>would</em> commit by running <code>git commit</code>; the second and
Junio C Hamano103b5722011-01-31 05:03:45762third are what you <em>could</em> commit by running <em>git add</em> before running
Junio C Hamano9d971152012-12-19 00:43:11763<code>git commit</code>.</p></div>
Junio C Hamanoa0fae262009-12-28 09:33:50764</div>
Junio C Hamano9d971152012-12-19 00:43:11765</div>
766<div class="sect1">
Junio C Hamanoa0fae262009-12-28 09:33:50767<h2 id="_options">OPTIONS</h2>
768<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45769<div class="dlist"><dl>
770<dt class="hdlist1">
Junio C Hamanoa0fae262009-12-28 09:33:50771-s
772</dt>
Junio C Hamano103b5722011-01-31 05:03:45773<dt class="hdlist1">
Junio C Hamanoa0fae262009-12-28 09:33:50774--short
775</dt>
776<dd>
777<p>
778 Give the output in the short-format.
779</p>
780</dd>
Junio C Hamano103b5722011-01-31 05:03:45781<dt class="hdlist1">
Junio C Hamanof5de4cf2010-06-19 00:33:17782-b
783</dt>
Junio C Hamano103b5722011-01-31 05:03:45784<dt class="hdlist1">
Junio C Hamanof5de4cf2010-06-19 00:33:17785--branch
786</dt>
787<dd>
788<p>
789 Show the branch and tracking info even in short-format.
790</p>
791</dd>
Junio C Hamano103b5722011-01-31 05:03:45792<dt class="hdlist1">
Junio C Hamanoa0fae262009-12-28 09:33:50793--porcelain
794</dt>
795<dd>
796<p>
Junio C Hamanoef5a2f92011-05-31 19:53:33797 Give the output in an easy-to-parse format for scripts.
798 This is similar to the short output, but will remain stable
799 across git versions and regardless of user configuration. See
800 below for details.
Junio C Hamanoa0fae262009-12-28 09:33:50801</p>
802</dd>
Junio C Hamano103b5722011-01-31 05:03:45803<dt class="hdlist1">
Junio C Hamanoa1295452012-11-13 22:32:04804--long
805</dt>
806<dd>
807<p>
808 Give the output in the long-format. This is the default.
809</p>
810</dd>
811<dt class="hdlist1">
Junio C Hamanoa0fae262009-12-28 09:33:50812-u[&lt;mode&gt;]
813</dt>
Junio C Hamano103b5722011-01-31 05:03:45814<dt class="hdlist1">
Junio C Hamanoa0fae262009-12-28 09:33:50815--untracked-files[=&lt;mode&gt;]
816</dt>
817<dd>
818<p>
Junio C Hamano36a4dbc2011-02-22 07:51:32819 Show untracked files.
Junio C Hamanoa0fae262009-12-28 09:33:50820</p>
Junio C Hamano36a4dbc2011-02-22 07:51:32821<div class="paragraph"><p>The mode parameter is optional (defaults to <em>all</em>), and is used to
822specify the handling of untracked files; when -u is not used, the
823default is <em>normal</em>, i.e. show untracked files and directories.</p></div>
824<div class="paragraph"><p>The possible options are:</p></div>
Junio C Hamano103b5722011-01-31 05:03:45825<div class="ulist"><ul>
Junio C Hamanoa0fae262009-12-28 09:33:50826<li>
827<p>
828<em>no</em> - Show no untracked files
829</p>
830</li>
831<li>
832<p>
833<em>normal</em> - Shows untracked files and directories
834</p>
835</li>
836<li>
837<p>
838<em>all</em> - Also shows individual files in untracked directories.
839</p>
Junio C Hamano36a4dbc2011-02-22 07:51:32840<div class="paragraph"><p>The default can be changed using the status.showUntrackedFiles
Junio C Hamanoa28a9202012-06-21 07:08:23841configuration variable documented in <a href="git-config.html">git-config(1)</a>.</p></div>
Junio C Hamanoa0fae262009-12-28 09:33:50842</li>
843</ul></div>
Junio C Hamanoa0fae262009-12-28 09:33:50844</dd>
Junio C Hamano103b5722011-01-31 05:03:45845<dt class="hdlist1">
Junio C Hamano7d449522010-07-01 00:08:51846--ignore-submodules[=&lt;when&gt;]
847</dt>
848<dd>
849<p>
850 Ignore changes to submodules when looking for changes. &lt;when&gt; can be
Junio C Hamano619596a2010-08-18 22:15:35851 either "none", "untracked", "dirty" or "all", which is the default.
852 Using "none" will consider the submodule modified when it either contains
853 untracked or modified files or its HEAD differs from the commit recorded
854 in the superproject and can be used to override any settings of the
Junio C Hamanoa28a9202012-06-21 07:08:23855 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
Junio C Hamano7d449522010-07-01 00:08:51856 "untracked" is used submodules are not considered dirty when they only
857 contain untracked content (but they are still scanned for modified
858 content). Using "dirty" ignores all changes to the work tree of submodules,
859 only changes to the commits stored in the superproject are shown (this was
860 the behavior before 1.7.0). Using "all" hides all changes to submodules
861 (and suppresses the output of submodule summaries when the config option
Junio C Hamano9d971152012-12-19 00:43:11862 <code>status.submodulesummary</code> is set).
Junio C Hamano7d449522010-07-01 00:08:51863</p>
864</dd>
Junio C Hamano103b5722011-01-31 05:03:45865<dt class="hdlist1">
Junio C Hamano4c4b0122011-06-30 01:19:32866--ignored
867</dt>
868<dd>
869<p>
870 Show ignored files as well.
871</p>
872</dd>
873<dt class="hdlist1">
Junio C Hamanoa0fae262009-12-28 09:33:50874-z
875</dt>
876<dd>
877<p>
878 Terminate entries with NUL, instead of LF. This implies
Junio C Hamano9d971152012-12-19 00:43:11879 the <code>--porcelain</code> output format if no other format is given.
Junio C Hamanoa0fae262009-12-28 09:33:50880</p>
881</dd>
Junio C Hamano22700fb2012-05-03 23:07:25882<dt class="hdlist1">
883--column[=&lt;options&gt;]
884</dt>
885<dt class="hdlist1">
886--no-column
887</dt>
888<dd>
889<p>
890 Display untracked files in columns. See configuration variable
Junio C Hamano9d971152012-12-19 00:43:11891 column.status for option syntax.<code>--column</code> and <code>--no-column</code>
Junio C Hamano22700fb2012-05-03 23:07:25892 without options are equivalent to <em>always</em> and <em>never</em>
893 respectively.
894</p>
895</dd>
Junio C Hamanoa0fae262009-12-28 09:33:50896</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23897</div>
Junio C Hamano9d971152012-12-19 00:43:11898</div>
899<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31900<h2 id="_output">OUTPUT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23901<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45902<div class="paragraph"><p>The output from this command is designed to be used as a commit
Junio C Hamanoa0fae262009-12-28 09:33:50903template comment, and all the output lines are prefixed with <em>#</em>.
904The default, long format, is designed to be human readable,
Junio C Hamanoef5a2f92011-05-31 19:53:33905verbose and descriptive. Its contents and format are subject to change
906at any time.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45907<div class="paragraph"><p>The paths mentioned in the output, unlike many other git commands, are
Junio C Hamano942b35e2007-12-09 10:19:33908made relative to the current directory if you are working in a
909subdirectory (this is on purpose, to help cutting and pasting). See
Junio C Hamanoba4b9282008-07-06 05:20:31910the status.relativePaths config option below.</p></div>
Junio C Hamano9d971152012-12-19 00:43:11911<div class="sect2">
912<h3 id="_short_format">Short Format</h3>
Junio C Hamanoef5a2f92011-05-31 19:53:33913<div class="paragraph"><p>In the short-format, the status of each path is shown as</p></div>
Junio C Hamanoa0fae262009-12-28 09:33:50914<div class="literalblock">
915<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11916<pre><code>XY PATH1 -&gt; PATH2</code></pre>
Junio C Hamanoa0fae262009-12-28 09:33:50917</div></div>
Junio C Hamano9d971152012-12-19 00:43:11918<div class="paragraph"><p>where <code>PATH1</code> is the path in the <code>HEAD</code>, and the " <code>-&gt; PATH2</code>" part is
919shown only when <code>PATH1</code> corresponds to a different path in the
Junio C Hamanofc5d7352010-04-24 02:59:11920index/worktree (i.e. the file is renamed). The <em>XY</em> is a two-letter
921status code.</p></div>
Junio C Hamano9d971152012-12-19 00:43:11922<div class="paragraph"><p>The fields (including the <code>-&gt;</code>) are separated from each other by a
Junio C Hamanofc5d7352010-04-24 02:59:11923single space. If a filename contains whitespace or other nonprintable
924characters, that field will be quoted in the manner of a C string
925literal: surrounded by ASCII double quote (34) characters, and with
926interior special characters backslash-escaped.</p></div>
Junio C Hamano9d971152012-12-19 00:43:11927<div class="paragraph"><p>For paths with merge conflicts, <code>X</code> and <em>Y</em> show the modification
Junio C Hamanofc5d7352010-04-24 02:59:11928states of each side of the merge. For paths that do not have merge
Junio C Hamano9d971152012-12-19 00:43:11929conflicts, <code>X</code> shows the status of the index, and <code>Y</code> shows the status
930of the work tree. For untracked paths, <code>XY</code> are <code>??</code>. Other status
Junio C Hamanofc5d7352010-04-24 02:59:11931codes can be interpreted as follows:</p></div>
Junio C Hamano103b5722011-01-31 05:03:45932<div class="ulist"><ul>
Junio C Hamanofc5d7352010-04-24 02:59:11933<li>
934<p>
Junio C Hamano103b5722011-01-31 05:03:45935' ' = unmodified
Junio C Hamanofc5d7352010-04-24 02:59:11936</p>
937</li>
938<li>
939<p>
940<em>M</em> = modified
941</p>
942</li>
943<li>
944<p>
945<em>A</em> = added
946</p>
947</li>
948<li>
949<p>
950<em>D</em> = deleted
951</p>
952</li>
953<li>
954<p>
955<em>R</em> = renamed
956</p>
957</li>
958<li>
959<p>
960<em>C</em> = copied
961</p>
962</li>
963<li>
964<p>
965<em>U</em> = updated but unmerged
966</p>
967</li>
968</ul></div>
Junio C Hamano9d971152012-12-19 00:43:11969<div class="paragraph"><p>Ignored files are not listed, unless <code>--ignored</code> option is in effect,
970in which case <code>XY</code> are <code>!!</code>.</p></div>
Junio C Hamanoa0fae262009-12-28 09:33:50971<div class="literalblock">
972<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11973<pre><code>X Y Meaning
Junio C Hamanoa0fae262009-12-28 09:33:50974-------------------------------------------------
975 [MD] not updated
976M [ MD] updated in index
977A [ MD] added to index
Junio C Hamanofc5d7352010-04-24 02:59:11978D [ M] deleted from index
Junio C Hamanoa0fae262009-12-28 09:33:50979R [ MD] renamed in index
980C [ MD] copied in index
981[MARC] index and work tree matches
982[ MARC] M work tree changed since index
983[ MARC] D deleted in work tree
984-------------------------------------------------
985D D unmerged, both deleted
986A U unmerged, added by us
987U D unmerged, deleted by them
988U A unmerged, added by them
989D U unmerged, deleted by us
990A A unmerged, both added
991U U unmerged, both modified
992-------------------------------------------------
993? ? untracked
Junio C Hamano4c4b0122011-06-30 01:19:32994! ! ignored
Junio C Hamano9d971152012-12-19 00:43:11995-------------------------------------------------</code></pre>
Junio C Hamanoa0fae262009-12-28 09:33:50996</div></div>
Junio C Hamano103b5722011-01-31 05:03:45997<div class="paragraph"><p>If -b is used the short-format status is preceded by a line</p></div>
998<div class="paragraph"><p>## branchname tracking info</p></div>
Junio C Hamano9d971152012-12-19 00:43:11999</div>
1000<div class="sect2">
1001<h3 id="_porcelain_format">Porcelain Format</h3>
Junio C Hamanoef5a2f92011-05-31 19:53:331002<div class="paragraph"><p>The porcelain format is similar to the short format, but is guaranteed
1003not to change in a backwards-incompatible way between git versions or
1004based on user configuration. This makes it ideal for parsing by scripts.
1005The description of the short format above also describes the porcelain
1006format, with a few exceptions:</p></div>
1007<div class="olist arabic"><ol class="arabic">
1008<li>
1009<p>
1010The user&#8217;s color.status configuration is not respected; color will
1011 always be off.
1012</p>
1013</li>
1014<li>
1015<p>
1016The user&#8217;s status.relativePaths configuration is not respected; paths
1017 shown will always be relative to the repository root.
1018</p>
1019</li>
1020</ol></div>
1021<div class="paragraph"><p>There is also an alternate -z format recommended for machine parsing. In
Junio C Hamanofc5d7352010-04-24 02:59:111022that format, the status field is the same, but some other things
Junio C Hamanoef5a2f92011-05-31 19:53:331023change. First, the <em>-&gt;</em> is omitted from rename entries and the field
1024order is reversed (e.g <em>from -&gt; to</em> becomes <em>to from</em>). Second, a NUL
Junio C Hamanofc5d7352010-04-24 02:59:111025(ASCII 0) follows each filename, replacing space as a field separator
1026and the terminating newline (but a space still separates the status
1027field from the first filename). Third, filenames containing special
1028characters are not specially formatted; no quoting or
Junio C Hamanobcdb12e2012-05-10 18:45:151029backslash-escaping is performed.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:231030</div>
Junio C Hamano9d971152012-12-19 00:43:111031</div>
1032</div>
1033<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:311034<h2 id="_configuration">CONFIGURATION</h2>
Junio C Hamanof9771f62007-01-17 17:42:301035<div class="sectionbody">
Junio C Hamano9d971152012-12-19 00:43:111036<div class="paragraph"><p>The command honors <code>color.status</code> (or <code>status.color</code>&#8201;&#8212;&#8201;they
Junio C Hamanof9771f62007-01-17 17:42:301037mean the same thing and the latter is kept for backward
Junio C Hamano9d971152012-12-19 00:43:111038compatibility) and <code>color.status.&lt;slot&gt;</code> configuration variables
Junio C Hamanoba4b9282008-07-06 05:20:311039to colorize its output.</p></div>
Junio C Hamano9d971152012-12-19 00:43:111040<div class="paragraph"><p>If the config variable <code>status.relativePaths</code> is set to false, then all
Junio C Hamano942b35e2007-12-09 10:19:331041paths shown are relative to the repository root, not to the current
Junio C Hamanoba4b9282008-07-06 05:20:311042directory.</p></div>
Junio C Hamano9d971152012-12-19 00:43:111043<div class="paragraph"><p>If <code>status.submodulesummary</code> is set to a non zero number or true (identical
Junio C Hamanoa0fae262009-12-28 09:33:501044to -1 or an unlimited number), the submodule summary will be enabled for
1045the long format and a summary of commits for modified submodules will be
Junio C Hamanoa28a9202012-06-21 07:08:231046shown (see --summary-limit option of <a href="git-submodule.html">git-submodule(1)</a>).</p></div>
Junio C Hamano679d22d2007-06-02 21:13:441047</div>
Junio C Hamano9d971152012-12-19 00:43:111048</div>
1049<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:311050<h2 id="_see_also">SEE ALSO</h2>
Junio C Hamano679d22d2007-06-02 21:13:441051<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:231052<div class="paragraph"><p><a href="gitignore.html">gitignore(5)</a></p></div>
Junio C Hamanof9771f62007-01-17 17:42:301053</div>
Junio C Hamano9d971152012-12-19 00:43:111054</div>
1055<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:311056<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:231057<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:231058<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:231059</div>
Junio C Hamano7bd050f2011-09-22 06:32:221060</div>
Junio C Hamano9d971152012-12-19 00:43:111061</div>
Junio C Hamano7bd050f2011-09-22 06:32:221062<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:231063<div id="footer">
1064<div id="footer-text">
Junio C Hamano9d971152012-12-19 00:43:111065Last updated 2012-11-13 14:31:09 PST
Junio C Hamano1a4e8412005-12-27 08:17:231066</div>
1067</div>
1068</body>
1069</html>