Autogenerated HTML docs for v1.7.6-rc1
[git/jnareb-git.git] / git-status.html
blob86dbe5e609ce660c3bd16a78c05b9ae58cf67f56
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4 <head>
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
6 <meta name="generator" content="AsciiDoc 8.4.5" />
7 <title>git-status(1)</title>
8 <style type="text/css">
9 /* Debug borders */
10 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
12 border: 1px solid red;
16 body {
17 margin: 1em 5% 1em 5%;
20 a {
21 color: blue;
22 text-decoration: underline;
24 a:visited {
25 color: fuchsia;
28 em {
29 font-style: italic;
30 color: navy;
33 strong {
34 font-weight: bold;
35 color: #083194;
38 tt {
39 color: navy;
42 h1, h2, h3, h4, h5, h6 {
43 color: #527bbd;
44 font-family: sans-serif;
45 margin-top: 1.2em;
46 margin-bottom: 0.5em;
47 line-height: 1.3;
50 h1, h2, h3 {
51 border-bottom: 2px solid silver;
53 h2 {
54 padding-top: 0.5em;
56 h3 {
57 float: left;
59 h3 + * {
60 clear: left;
63 div.sectionbody {
64 font-family: serif;
65 margin-left: 0;
68 hr {
69 border: 1px solid silver;
72 p {
73 margin-top: 0.5em;
74 margin-bottom: 0.5em;
77 ul, ol, li > p {
78 margin-top: 0;
81 pre {
82 padding: 0;
83 margin: 0;
86 span#author {
87 color: #527bbd;
88 font-family: sans-serif;
89 font-weight: bold;
90 font-size: 1.1em;
92 span#email {
94 span#revnumber, span#revdate, span#revremark {
95 font-family: sans-serif;
98 div#footer {
99 font-family: sans-serif;
100 font-size: small;
101 border-top: 2px solid silver;
102 padding-top: 0.5em;
103 margin-top: 4.0em;
105 div#footer-text {
106 float: left;
107 padding-bottom: 0.5em;
109 div#footer-badges {
110 float: right;
111 padding-bottom: 0.5em;
114 div#preamble {
115 margin-top: 1.5em;
116 margin-bottom: 1.5em;
118 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
119 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
120 div.admonitionblock {
121 margin-top: 1.5em;
122 margin-bottom: 1.5em;
124 div.admonitionblock {
125 margin-top: 2.5em;
126 margin-bottom: 2.5em;
129 div.content { /* Block element content. */
130 padding: 0;
133 /* Block element titles. */
134 div.title, caption.title {
135 color: #527bbd;
136 font-family: sans-serif;
137 font-weight: bold;
138 text-align: left;
139 margin-top: 1.0em;
140 margin-bottom: 0.5em;
142 div.title + * {
143 margin-top: 0;
146 td div.title:first-child {
147 margin-top: 0.0em;
149 div.content div.title:first-child {
150 margin-top: 0.0em;
152 div.content + div.title {
153 margin-top: 0.0em;
156 div.sidebarblock > div.content {
157 background: #ffffee;
158 border: 1px solid silver;
159 padding: 0.5em;
162 div.listingblock > div.content {
163 border: 1px solid silver;
164 background: #f4f4f4;
165 padding: 0.5em;
168 div.quoteblock {
169 padding-left: 2.0em;
170 margin-right: 10%;
172 div.quoteblock > div.attribution {
173 padding-top: 0.5em;
174 text-align: right;
177 div.verseblock {
178 padding-left: 2.0em;
179 margin-right: 10%;
181 div.verseblock > div.content {
182 white-space: pre;
184 div.verseblock > div.attribution {
185 padding-top: 0.75em;
186 text-align: left;
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
189 div.verseblock + div.attribution {
190 text-align: left;
193 div.admonitionblock .icon {
194 vertical-align: top;
195 font-size: 1.1em;
196 font-weight: bold;
197 text-decoration: underline;
198 color: #527bbd;
199 padding-right: 0.5em;
201 div.admonitionblock td.content {
202 padding-left: 0.5em;
203 border-left: 2px solid silver;
206 div.exampleblock > div.content {
207 border-left: 2px solid silver;
208 padding: 0.5em;
211 div.imageblock div.content { padding-left: 0; }
212 span.image img { border-style: none; }
213 a.image:visited { color: white; }
215 dl {
216 margin-top: 0.8em;
217 margin-bottom: 0.8em;
219 dt {
220 margin-top: 0.5em;
221 margin-bottom: 0;
222 font-style: normal;
223 color: navy;
225 dd > *:first-child {
226 margin-top: 0.1em;
229 ul, ol {
230 list-style-position: outside;
232 ol.arabic {
233 list-style-type: decimal;
235 ol.loweralpha {
236 list-style-type: lower-alpha;
238 ol.upperalpha {
239 list-style-type: upper-alpha;
241 ol.lowerroman {
242 list-style-type: lower-roman;
244 ol.upperroman {
245 list-style-type: upper-roman;
248 div.compact ul, div.compact ol,
249 div.compact p, div.compact p,
250 div.compact div, div.compact div {
251 margin-top: 0.1em;
252 margin-bottom: 0.1em;
255 div.tableblock > table {
256 border: 3px solid #527bbd;
258 thead {
259 font-family: sans-serif;
260 font-weight: bold;
262 tfoot {
263 font-weight: bold;
265 td > div.verse {
266 white-space: pre;
268 p.table {
269 margin-top: 0;
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
272 div.tableblock > table[frame="void"] {
273 border-style: none;
275 div.tableblock > table[frame="hsides"] {
276 border-left-style: none;
277 border-right-style: none;
279 div.tableblock > table[frame="vsides"] {
280 border-top-style: none;
281 border-bottom-style: none;
285 div.hdlist {
286 margin-top: 0.8em;
287 margin-bottom: 0.8em;
289 div.hdlist tr {
290 padding-bottom: 15px;
292 dt.hdlist1.strong, td.hdlist1.strong {
293 font-weight: bold;
295 td.hdlist1 {
296 vertical-align: top;
297 font-style: normal;
298 padding-right: 0.8em;
299 color: navy;
301 td.hdlist2 {
302 vertical-align: top;
304 div.hdlist.compact tr {
305 margin: 0;
306 padding-bottom: 0;
309 .comment {
310 background: yellow;
313 @media print {
314 div#footer-badges { display: none; }
317 div#toctitle {
318 color: #527bbd;
319 font-family: sans-serif;
320 font-size: 1.1em;
321 font-weight: bold;
322 margin-top: 1.0em;
323 margin-bottom: 0.1em;
326 div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
327 margin-top: 0;
328 margin-bottom: 0;
330 div.toclevel2 {
331 margin-left: 2em;
332 font-size: 0.9em;
334 div.toclevel3 {
335 margin-left: 4em;
336 font-size: 0.9em;
338 div.toclevel4 {
339 margin-left: 6em;
340 font-size: 0.9em;
342 /* Overrides for manpage documents */
343 h1 {
344 padding-top: 0.5em;
345 padding-bottom: 0.5em;
346 border-top: 2px solid silver;
347 border-bottom: 2px solid silver;
349 h2 {
350 border-style: none;
352 div.sectionbody {
353 margin-left: 5%;
356 @media print {
357 div#toc { display: none; }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
362 div.sidebar-content {
363 background: #ffffee;
364 border: 1px solid silver;
365 padding: 0.5em;
367 div.sidebar-title, div.image-title {
368 color: #527bbd;
369 font-family: sans-serif;
370 font-weight: bold;
371 margin-top: 0.0em;
372 margin-bottom: 0.5em;
375 div.listingblock div.content {
376 border: 1px solid silver;
377 background: #f4f4f4;
378 padding: 0.5em;
381 div.quoteblock-attribution {
382 padding-top: 0.5em;
383 text-align: right;
386 div.verseblock-content {
387 white-space: pre;
389 div.verseblock-attribution {
390 padding-top: 0.75em;
391 text-align: left;
394 div.exampleblock-content {
395 border-left: 2px solid silver;
396 padding-left: 0.5em;
399 /* IE6 sets dynamically generated links as visited. */
400 div#toc a:visited { color: blue; }
401 </style>
402 </head>
403 <body>
404 <div id="header">
405 <h1>
406 git-status(1) Manual Page
407 </h1>
408 <h2>NAME</h2>
409 <div class="sectionbody">
410 <p>git-status -
411 Show the working tree status
412 </p>
413 </div>
414 </div>
415 <h2 id="_synopsis">SYNOPSIS</h2>
416 <div class="sectionbody">
417 <div class="paragraph"><p><em>git status</em> [&lt;options&gt;&#8230;] [--] [&lt;pathspec&gt;&#8230;]</p></div>
418 </div>
419 <h2 id="_description">DESCRIPTION</h2>
420 <div class="sectionbody">
421 <div class="paragraph"><p>Displays paths that have differences between the index file and the
422 current HEAD commit, paths that have differences between the working
423 tree and the index file, and paths in the working tree that are not
424 tracked by git (and are not ignored by <a href="gitignore.html">gitignore(5)</a>). The first
425 are what you <em>would</em> commit by running <tt>git commit</tt>; the second and
426 third are what you <em>could</em> commit by running <em>git add</em> before running
427 <tt>git commit</tt>.</p></div>
428 </div>
429 <h2 id="_options">OPTIONS</h2>
430 <div class="sectionbody">
431 <div class="dlist"><dl>
432 <dt class="hdlist1">
434 </dt>
435 <dt class="hdlist1">
436 --short
437 </dt>
438 <dd>
440 Give the output in the short-format.
441 </p>
442 </dd>
443 <dt class="hdlist1">
445 </dt>
446 <dt class="hdlist1">
447 --branch
448 </dt>
449 <dd>
451 Show the branch and tracking info even in short-format.
452 </p>
453 </dd>
454 <dt class="hdlist1">
455 --porcelain
456 </dt>
457 <dd>
459 Give the output in an easy-to-parse format for scripts.
460 This is similar to the short output, but will remain stable
461 across git versions and regardless of user configuration. See
462 below for details.
463 </p>
464 </dd>
465 <dt class="hdlist1">
466 -u[&lt;mode&gt;]
467 </dt>
468 <dt class="hdlist1">
469 --untracked-files[=&lt;mode&gt;]
470 </dt>
471 <dd>
473 Show untracked files.
474 </p>
475 <div class="paragraph"><p>The mode parameter is optional (defaults to <em>all</em>), and is used to
476 specify the handling of untracked files; when -u is not used, the
477 default is <em>normal</em>, i.e. show untracked files and directories.</p></div>
478 <div class="paragraph"><p>The possible options are:</p></div>
479 <div class="ulist"><ul>
480 <li>
482 <em>no</em> - Show no untracked files
483 </p>
484 </li>
485 <li>
487 <em>normal</em> - Shows untracked files and directories
488 </p>
489 </li>
490 <li>
492 <em>all</em> - Also shows individual files in untracked directories.
493 </p>
494 <div class="paragraph"><p>The default can be changed using the status.showUntrackedFiles
495 configuration variable documented in <a href="git-config.html">git-config(1)</a>.</p></div>
496 </li>
497 </ul></div>
498 </dd>
499 <dt class="hdlist1">
500 --ignore-submodules[=&lt;when&gt;]
501 </dt>
502 <dd>
504 Ignore changes to submodules when looking for changes. &lt;when&gt; can be
505 either "none", "untracked", "dirty" or "all", which is the default.
506 Using "none" will consider the submodule modified when it either contains
507 untracked or modified files or its HEAD differs from the commit recorded
508 in the superproject and can be used to override any settings of the
509 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
510 "untracked" is used submodules are not considered dirty when they only
511 contain untracked content (but they are still scanned for modified
512 content). Using "dirty" ignores all changes to the work tree of submodules,
513 only changes to the commits stored in the superproject are shown (this was
514 the behavior before 1.7.0). Using "all" hides all changes to submodules
515 (and suppresses the output of submodule summaries when the config option
516 <tt>status.submodulesummary</tt> is set).
517 </p>
518 </dd>
519 <dt class="hdlist1">
521 </dt>
522 <dd>
524 Terminate entries with NUL, instead of LF. This implies
525 the <tt>--porcelain</tt> output format if no other format is given.
526 </p>
527 </dd>
528 </dl></div>
529 </div>
530 <h2 id="_output">OUTPUT</h2>
531 <div class="sectionbody">
532 <div class="paragraph"><p>The output from this command is designed to be used as a commit
533 template comment, and all the output lines are prefixed with <em>#</em>.
534 The default, long format, is designed to be human readable,
535 verbose and descriptive. Its contents and format are subject to change
536 at any time.</p></div>
537 <div class="paragraph"><p>The paths mentioned in the output, unlike many other git commands, are
538 made relative to the current directory if you are working in a
539 subdirectory (this is on purpose, to help cutting and pasting). See
540 the status.relativePaths config option below.</p></div>
541 <h3 id="_short_format">Short Format</h3><div style="clear:left"></div>
542 <div class="paragraph"><p>In the short-format, the status of each path is shown as</p></div>
543 <div class="literalblock">
544 <div class="content">
545 <pre><tt>XY PATH1 -&gt; PATH2</tt></pre>
546 </div></div>
547 <div class="paragraph"><p>where <tt>PATH1</tt> is the path in the <tt>HEAD</tt>, and the ` -&gt; PATH2` part is
548 shown only when <tt>PATH1</tt> corresponds to a different path in the
549 index/worktree (i.e. the file is renamed). The <em>XY</em> is a two-letter
550 status code.</p></div>
551 <div class="paragraph"><p>The fields (including the <tt>-&gt;</tt>) are separated from each other by a
552 single space. If a filename contains whitespace or other nonprintable
553 characters, that field will be quoted in the manner of a C string
554 literal: surrounded by ASCII double quote (34) characters, and with
555 interior special characters backslash-escaped.</p></div>
556 <div class="paragraph"><p>For paths with merge conflicts, <tt>X</tt> and <em>Y</em> show the modification
557 states of each side of the merge. For paths that do not have merge
558 conflicts, <tt>X</tt> shows the status of the index, and <tt>Y</tt> shows the status
559 of the work tree. For untracked paths, <tt>XY</tt> are <tt>??</tt>. Other status
560 codes can be interpreted as follows:</p></div>
561 <div class="ulist"><ul>
562 <li>
564 ' ' = unmodified
565 </p>
566 </li>
567 <li>
569 <em>M</em> = modified
570 </p>
571 </li>
572 <li>
574 <em>A</em> = added
575 </p>
576 </li>
577 <li>
579 <em>D</em> = deleted
580 </p>
581 </li>
582 <li>
584 <em>R</em> = renamed
585 </p>
586 </li>
587 <li>
589 <em>C</em> = copied
590 </p>
591 </li>
592 <li>
594 <em>U</em> = updated but unmerged
595 </p>
596 </li>
597 </ul></div>
598 <div class="paragraph"><p>Ignored files are not listed.</p></div>
599 <div class="literalblock">
600 <div class="content">
601 <pre><tt>X Y Meaning
602 -------------------------------------------------
603 [MD] not updated
604 M [ MD] updated in index
605 A [ MD] added to index
606 D [ M] deleted from index
607 R [ MD] renamed in index
608 C [ MD] copied in index
609 [MARC] index and work tree matches
610 [ MARC] M work tree changed since index
611 [ MARC] D deleted in work tree
612 -------------------------------------------------
613 D D unmerged, both deleted
614 A U unmerged, added by us
615 U D unmerged, deleted by them
616 U A unmerged, added by them
617 D U unmerged, deleted by us
618 A A unmerged, both added
619 U U unmerged, both modified
620 -------------------------------------------------
621 ? ? untracked
622 -------------------------------------------------</tt></pre>
623 </div></div>
624 <div class="paragraph"><p>If -b is used the short-format status is preceded by a line</p></div>
625 <div class="paragraph"><p>## branchname tracking info</p></div>
626 <h3 id="_porcelain_format">Porcelain Format</h3><div style="clear:left"></div>
627 <div class="paragraph"><p>The porcelain format is similar to the short format, but is guaranteed
628 not to change in a backwards-incompatible way between git versions or
629 based on user configuration. This makes it ideal for parsing by scripts.
630 The description of the short format above also describes the porcelain
631 format, with a few exceptions:</p></div>
632 <div class="olist arabic"><ol class="arabic">
633 <li>
635 The user&#8217;s color.status configuration is not respected; color will
636 always be off.
637 </p>
638 </li>
639 <li>
641 The user&#8217;s status.relativePaths configuration is not respected; paths
642 shown will always be relative to the repository root.
643 </p>
644 </li>
645 </ol></div>
646 <div class="paragraph"><p>There is also an alternate -z format recommended for machine parsing. In
647 that format, the status field is the same, but some other things
648 change. First, the <em>-&gt;</em> is omitted from rename entries and the field
649 order is reversed (e.g <em>from -&gt; to</em> becomes <em>to from</em>). Second, a NUL
650 (ASCII 0) follows each filename, replacing space as a field separator
651 and the terminating newline (but a space still separates the status
652 field from the first filename). Third, filenames containing special
653 characters are not specially formatted; no quoting or
654 backslash-escaping is performed. Fourth, there is no branch line.</p></div>
655 </div>
656 <h2 id="_configuration">CONFIGURATION</h2>
657 <div class="sectionbody">
658 <div class="paragraph"><p>The command honors <tt>color.status</tt> (or <tt>status.color</tt>&#8201;&#8212;&#8201;they
659 mean the same thing and the latter is kept for backward
660 compatibility) and <tt>color.status.&lt;slot&gt;</tt> configuration variables
661 to colorize its output.</p></div>
662 <div class="paragraph"><p>If the config variable <tt>status.relativePaths</tt> is set to false, then all
663 paths shown are relative to the repository root, not to the current
664 directory.</p></div>
665 <div class="paragraph"><p>If <tt>status.submodulesummary</tt> is set to a non zero number or true (identical
666 to -1 or an unlimited number), the submodule summary will be enabled for
667 the long format and a summary of commits for modified submodules will be
668 shown (see --summary-limit option of <a href="git-submodule.html">git-submodule(1)</a>).</p></div>
669 </div>
670 <h2 id="_see_also">SEE ALSO</h2>
671 <div class="sectionbody">
672 <div class="paragraph"><p><a href="gitignore.html">gitignore(5)</a></p></div>
673 </div>
674 <h2 id="_git">GIT</h2>
675 <div class="sectionbody">
676 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
677 </div>
678 <div id="footer">
679 <div id="footer-text">
680 Last updated 2011-05-31 19:53:01 UTC
681 </div>
682 </div>
683 </body>
684 </html>