<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" | |
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> | |
<head> | |
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> | |
<meta name="generator" content="AsciiDoc 8.6.9" /> | |
<title>git-status(1)</title> | |
<style type="text/css"> | |
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */ | |
/* Default font. */ | |
body { | |
font-family: Georgia,serif; | |
} | |
/* Title font. */ | |
h1, h2, h3, h4, h5, h6, | |
div.title, caption.title, | |
thead, p.table.header, | |
#toctitle, | |
#author, #revnumber, #revdate, #revremark, | |
#footer { | |
font-family: Arial,Helvetica,sans-serif; | |
} | |
body { | |
margin: 1em 5% 1em 5%; | |
} | |
a { | |
color: blue; | |
text-decoration: underline; | |
} | |
a:visited { | |
color: fuchsia; | |
} | |
em { | |
font-style: italic; | |
color: navy; | |
} | |
strong { | |
font-weight: bold; | |
color: #083194; | |
} | |
h1, h2, h3, h4, h5, h6 { | |
color: #527bbd; | |
margin-top: 1.2em; | |
margin-bottom: 0.5em; | |
line-height: 1.3; | |
} | |
h1, h2, h3 { | |
border-bottom: 2px solid silver; | |
} | |
h2 { | |
padding-top: 0.5em; | |
} | |
h3 { | |
float: left; | |
} | |
h3 + * { | |
clear: left; | |
} | |
h5 { | |
font-size: 1.0em; | |
} | |
div.sectionbody { | |
margin-left: 0; | |
} | |
hr { | |
border: 1px solid silver; | |
} | |
p { | |
margin-top: 0.5em; | |
margin-bottom: 0.5em; | |
} | |
ul, ol, li > p { | |
margin-top: 0; | |
} | |
ul > li { color: #aaa; } | |
ul > li > * { color: black; } | |
.monospaced, code, pre { | |
font-family: "Courier New", Courier, monospace; | |
font-size: inherit; | |
color: navy; | |
padding: 0; | |
margin: 0; | |
} | |
pre { | |
white-space: pre-wrap; | |
} | |
#author { | |
color: #527bbd; | |
font-weight: bold; | |
font-size: 1.1em; | |
} | |
#email { | |
} | |
#revnumber, #revdate, #revremark { | |
} | |
#footer { | |
font-size: small; | |
border-top: 2px solid silver; | |
padding-top: 0.5em; | |
margin-top: 4.0em; | |
} | |
#footer-text { | |
float: left; | |
padding-bottom: 0.5em; | |
} | |
#footer-badges { | |
float: right; | |
padding-bottom: 0.5em; | |
} | |
#preamble { | |
margin-top: 1.5em; | |
margin-bottom: 1.5em; | |
} | |
div.imageblock, div.exampleblock, div.verseblock, | |
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, | |
div.admonitionblock { | |
margin-top: 1.0em; | |
margin-bottom: 1.5em; | |
} | |
div.admonitionblock { | |
margin-top: 2.0em; | |
margin-bottom: 2.0em; | |
margin-right: 10%; | |
color: #606060; | |
} | |
div.content { /* Block element content. */ | |
padding: 0; | |
} | |
/* Block element titles. */ | |
div.title, caption.title { | |
color: #527bbd; | |
font-weight: bold; | |
text-align: left; | |
margin-top: 1.0em; | |
margin-bottom: 0.5em; | |
} | |
div.title + * { | |
margin-top: 0; | |
} | |
td div.title:first-child { | |
margin-top: 0.0em; | |
} | |
div.content div.title:first-child { | |
margin-top: 0.0em; | |
} | |
div.content + div.title { | |
margin-top: 0.0em; | |
} | |
div.sidebarblock > div.content { | |
background: #ffffee; | |
border: 1px solid #dddddd; | |
border-left: 4px solid #f0f0f0; | |
padding: 0.5em; | |
} | |
div.listingblock > div.content { | |
border: 1px solid #dddddd; | |
border-left: 5px solid #f0f0f0; | |
background: #f8f8f8; | |
padding: 0.5em; | |
} | |
div.quoteblock, div.verseblock { | |
padding-left: 1.0em; | |
margin-left: 1.0em; | |
margin-right: 10%; | |
border-left: 5px solid #f0f0f0; | |
color: #888; | |
} | |
div.quoteblock > div.attribution { | |
padding-top: 0.5em; | |
text-align: right; | |
} | |
div.verseblock > pre.content { | |
font-family: inherit; | |
font-size: inherit; | |
} | |
div.verseblock > div.attribution { | |
padding-top: 0.75em; | |
text-align: left; | |
} | |
/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ | |
div.verseblock + div.attribution { | |
text-align: left; | |
} | |
div.admonitionblock .icon { | |
vertical-align: top; | |
font-size: 1.1em; | |
font-weight: bold; | |
text-decoration: underline; | |
color: #527bbd; | |
padding-right: 0.5em; | |
} | |
div.admonitionblock td.content { | |
padding-left: 0.5em; | |
border-left: 3px solid #dddddd; | |
} | |
div.exampleblock > div.content { | |
border-left: 3px solid #dddddd; | |
padding-left: 0.5em; | |
} | |
div.imageblock div.content { padding-left: 0; } | |
span.image img { border-style: none; vertical-align: text-bottom; } | |
a.image:visited { color: white; } | |
dl { | |
margin-top: 0.8em; | |
margin-bottom: 0.8em; | |
} | |
dt { | |
margin-top: 0.5em; | |
margin-bottom: 0; | |
font-style: normal; | |
color: navy; | |
} | |
dd > *:first-child { | |
margin-top: 0.1em; | |
} | |
ul, ol { | |
list-style-position: outside; | |
} | |
ol.arabic { | |
list-style-type: decimal; | |
} | |
ol.loweralpha { | |
list-style-type: lower-alpha; | |
} | |
ol.upperalpha { | |
list-style-type: upper-alpha; | |
} | |
ol.lowerroman { | |
list-style-type: lower-roman; | |
} | |
ol.upperroman { | |
list-style-type: upper-roman; | |
} | |
div.compact ul, div.compact ol, | |
div.compact p, div.compact p, | |
div.compact div, div.compact div { | |
margin-top: 0.1em; | |
margin-bottom: 0.1em; | |
} | |
tfoot { | |
font-weight: bold; | |
} | |
td > div.verse { | |
white-space: pre; | |
} | |
div.hdlist { | |
margin-top: 0.8em; | |
margin-bottom: 0.8em; | |
} | |
div.hdlist tr { | |
padding-bottom: 15px; | |
} | |
dt.hdlist1.strong, td.hdlist1.strong { | |
font-weight: bold; | |
} | |
td.hdlist1 { | |
vertical-align: top; | |
font-style: normal; | |
padding-right: 0.8em; | |
color: navy; | |
} | |
td.hdlist2 { | |
vertical-align: top; | |
} | |
div.hdlist.compact tr { | |
margin: 0; | |
padding-bottom: 0; | |
} | |
.comment { | |
background: yellow; | |
} | |
.footnote, .footnoteref { | |
font-size: 0.8em; | |
} | |
span.footnote, span.footnoteref { | |
vertical-align: super; | |
} | |
#footnotes { | |
margin: 20px 0 20px 0; | |
padding: 7px 0 0 0; | |
} | |
#footnotes div.footnote { | |
margin: 0 0 5px 0; | |
} | |
#footnotes hr { | |
border: none; | |
border-top: 1px solid silver; | |
height: 1px; | |
text-align: left; | |
margin-left: 0; | |
width: 20%; | |
min-width: 100px; | |
} | |
div.colist td { | |
padding-right: 0.5em; | |
padding-bottom: 0.3em; | |
vertical-align: top; | |
} | |
div.colist td img { | |
margin-top: 0.3em; | |
} | |
@media print { | |
#footer-badges { display: none; } | |
} | |
#toc { | |
margin-bottom: 2.5em; | |
} | |
#toctitle { | |
color: #527bbd; | |
font-size: 1.1em; | |
font-weight: bold; | |
margin-top: 1.0em; | |
margin-bottom: 0.1em; | |
} | |
div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { | |
margin-top: 0; | |
margin-bottom: 0; | |
} | |
div.toclevel2 { | |
margin-left: 2em; | |
font-size: 0.9em; | |
} | |
div.toclevel3 { | |
margin-left: 4em; | |
font-size: 0.9em; | |
} | |
div.toclevel4 { | |
margin-left: 6em; | |
font-size: 0.9em; | |
} | |
span.aqua { color: aqua; } | |
span.black { color: black; } | |
span.blue { color: blue; } | |
span.fuchsia { color: fuchsia; } | |
span.gray { color: gray; } | |
span.green { color: green; } | |
span.lime { color: lime; } | |
span.maroon { color: maroon; } | |
span.navy { color: navy; } | |
span.olive { color: olive; } | |
span.purple { color: purple; } | |
span.red { color: red; } | |
span.silver { color: silver; } | |
span.teal { color: teal; } | |
span.white { color: white; } | |
span.yellow { color: yellow; } | |
span.aqua-background { background: aqua; } | |
span.black-background { background: black; } | |
span.blue-background { background: blue; } | |
span.fuchsia-background { background: fuchsia; } | |
span.gray-background { background: gray; } | |
span.green-background { background: green; } | |
span.lime-background { background: lime; } | |
span.maroon-background { background: maroon; } | |
span.navy-background { background: navy; } | |
span.olive-background { background: olive; } | |
span.purple-background { background: purple; } | |
span.red-background { background: red; } | |
span.silver-background { background: silver; } | |
span.teal-background { background: teal; } | |
span.white-background { background: white; } | |
span.yellow-background { background: yellow; } | |
span.big { font-size: 2em; } | |
span.small { font-size: 0.6em; } | |
span.underline { text-decoration: underline; } | |
span.overline { text-decoration: overline; } | |
span.line-through { text-decoration: line-through; } | |
div.unbreakable { page-break-inside: avoid; } | |
/* | |
* xhtml11 specific | |
* | |
* */ | |
div.tableblock { | |
margin-top: 1.0em; | |
margin-bottom: 1.5em; | |
} | |
div.tableblock > table { | |
border: 3px solid #527bbd; | |
} | |
thead, p.table.header { | |
font-weight: bold; | |
color: #527bbd; | |
} | |
p.table { | |
margin-top: 0; | |
} | |
/* Because the table frame attribute is overriden by CSS in most browsers. */ | |
div.tableblock > table[frame="void"] { | |
border-style: none; | |
} | |
div.tableblock > table[frame="hsides"] { | |
border-left-style: none; | |
border-right-style: none; | |
} | |
div.tableblock > table[frame="vsides"] { | |
border-top-style: none; | |
border-bottom-style: none; | |
} | |
/* | |
* html5 specific | |
* | |
* */ | |
table.tableblock { | |
margin-top: 1.0em; | |
margin-bottom: 1.5em; | |
} | |
thead, p.tableblock.header { | |
font-weight: bold; | |
color: #527bbd; | |
} | |
p.tableblock { | |
margin-top: 0; | |
} | |
table.tableblock { | |
border-width: 3px; | |
border-spacing: 0px; | |
border-style: solid; | |
border-color: #527bbd; | |
border-collapse: collapse; | |
} | |
th.tableblock, td.tableblock { | |
border-width: 1px; | |
padding: 4px; | |
border-style: solid; | |
border-color: #527bbd; | |
} | |
table.tableblock.frame-topbot { | |
border-left-style: hidden; | |
border-right-style: hidden; | |
} | |
table.tableblock.frame-sides { | |
border-top-style: hidden; | |
border-bottom-style: hidden; | |
} | |
table.tableblock.frame-none { | |
border-style: hidden; | |
} | |
th.tableblock.halign-left, td.tableblock.halign-left { | |
text-align: left; | |
} | |
th.tableblock.halign-center, td.tableblock.halign-center { | |
text-align: center; | |
} | |
th.tableblock.halign-right, td.tableblock.halign-right { | |
text-align: right; | |
} | |
th.tableblock.valign-top, td.tableblock.valign-top { | |
vertical-align: top; | |
} | |
th.tableblock.valign-middle, td.tableblock.valign-middle { | |
vertical-align: middle; | |
} | |
th.tableblock.valign-bottom, td.tableblock.valign-bottom { | |
vertical-align: bottom; | |
} | |
/* | |
* manpage specific | |
* | |
* */ | |
body.manpage h1 { | |
padding-top: 0.5em; | |
padding-bottom: 0.5em; | |
border-top: 2px solid silver; | |
border-bottom: 2px solid silver; | |
} | |
body.manpage h2 { | |
border-style: none; | |
} | |
body.manpage div.sectionbody { | |
margin-left: 3em; | |
} | |
@media print { | |
body.manpage div#toc { display: none; } | |
} | |
</style> | |
<script type="text/javascript"> | |
/*<![CDATA[*/ | |
var asciidoc = { // Namespace. | |
///////////////////////////////////////////////////////////////////// | |
// Table Of Contents generator | |
///////////////////////////////////////////////////////////////////// | |
/* Author: Mihai Bazon, September 2002 | |
* http://students.infoiasi.ro/~mishoo | |
* | |
* Table Of Content generator | |
* Version: 0.4 | |
* | |
* Feel free to use this script under the terms of the GNU General Public | |
* License, as long as you do not remove or alter this notice. | |
*/ | |
/* modified by Troy D. Hanson, September 2006. License: GPL */ | |
/* modified by Stuart Rackham, 2006, 2009. License: GPL */ | |
// toclevels = 1..4. | |
toc: function (toclevels) { | |
function getText(el) { | |
var text = ""; | |
for (var i = el.firstChild; i != null; i = i.nextSibling) { | |
if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants. | |
text += i.data; | |
else if (i.firstChild != null) | |
text += getText(i); | |
} | |
return text; | |
} | |
function TocEntry(el, text, toclevel) { | |
this.element = el; | |
this.text = text; | |
this.toclevel = toclevel; | |
} | |
function tocEntries(el, toclevels) { | |
var result = new Array; | |
var re = new RegExp('[hH]([1-'+(toclevels+1)+'])'); | |
// Function that scans the DOM tree for header elements (the DOM2 | |
// nodeIterator API would be a better technique but not supported by all | |
// browsers). | |
var iterate = function (el) { | |
for (var i = el.firstChild; i != null; i = i.nextSibling) { | |
if (i.nodeType == 1 /* Node.ELEMENT_NODE */) { | |
var mo = re.exec(i.tagName); | |
if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") { | |
result[result.length] = new TocEntry(i, getText(i), mo[1]-1); | |
} | |
iterate(i); | |
} | |
} | |
} | |
iterate(el); | |
return result; | |
} | |
var toc = document.getElementById("toc"); | |
if (!toc) { | |
return; | |
} | |
// Delete existing TOC entries in case we're reloading the TOC. | |
var tocEntriesToRemove = []; | |
var i; | |
for (i = 0; i < toc.childNodes.length; i++) { | |
var entry = toc.childNodes[i]; | |
if (entry.nodeName.toLowerCase() == 'div' | |
&& entry.getAttribute("class") | |
&& entry.getAttribute("class").match(/^toclevel/)) | |
tocEntriesToRemove.push(entry); | |
} | |
for (i = 0; i < tocEntriesToRemove.length; i++) { | |
toc.removeChild(tocEntriesToRemove[i]); | |
} | |
// Rebuild TOC entries. | |
var entries = tocEntries(document.getElementById("content"), toclevels); | |
for (var i = 0; i < entries.length; ++i) { | |
var entry = entries[i]; | |
if (entry.element.id == "") | |
entry.element.id = "_toc_" + i; | |
var a = document.createElement("a"); | |
a.href = "#" + entry.element.id; | |
a.appendChild(document.createTextNode(entry.text)); | |
var div = document.createElement("div"); | |
div.appendChild(a); | |
div.className = "toclevel" + entry.toclevel; | |
toc.appendChild(div); | |
} | |
if (entries.length == 0) | |
toc.parentNode.removeChild(toc); | |
}, | |
///////////////////////////////////////////////////////////////////// | |
// Footnotes generator | |
///////////////////////////////////////////////////////////////////// | |
/* Based on footnote generation code from: | |
* http://www.brandspankingnew.net/archive/2005/07/format_footnote.html | |
*/ | |
footnotes: function () { | |
// Delete existing footnote entries in case we're reloading the footnodes. | |
var i; | |
var noteholder = document.getElementById("footnotes"); | |
if (!noteholder) { | |
return; | |
} | |
var entriesToRemove = []; | |
for (i = 0; i < noteholder.childNodes.length; i++) { | |
var entry = noteholder.childNodes[i]; | |
if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote") | |
entriesToRemove.push(entry); | |
} | |
for (i = 0; i < entriesToRemove.length; i++) { | |
noteholder.removeChild(entriesToRemove[i]); | |
} | |
// Rebuild footnote entries. | |
var cont = document.getElementById("content"); | |
var spans = cont.getElementsByTagName("span"); | |
var refs = {}; | |
var n = 0; | |
for (i=0; i<spans.length; i++) { | |
if (spans[i].className == "footnote") { | |
n++; | |
var note = spans[i].getAttribute("data-note"); | |
if (!note) { | |
// Use [\s\S] in place of . so multi-line matches work. | |
// Because JavaScript has no s (dotall) regex flag. | |
note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1]; | |
spans[i].innerHTML = | |
"[<a id='_footnoteref_" + n + "' href='#_footnote_" + n + | |
"' title='View footnote' class='footnote'>" + n + "</a>]"; | |
spans[i].setAttribute("data-note", note); | |
} | |
noteholder.innerHTML += | |
"<div class='footnote' id='_footnote_" + n + "'>" + | |
"<a href='#_footnoteref_" + n + "' title='Return to text'>" + | |
n + "</a>. " + note + "</div>"; | |
var id =spans[i].getAttribute("id"); | |
if (id != null) refs["#"+id] = n; | |
} | |
} | |
if (n == 0) | |
noteholder.parentNode.removeChild(noteholder); | |
else { | |
// Process footnoterefs. | |
for (i=0; i<spans.length; i++) { | |
if (spans[i].className == "footnoteref") { | |
var href = spans[i].getElementsByTagName("a")[0].getAttribute("href"); | |
href = href.match(/#.*/)[0]; // Because IE return full URL. | |
n = refs[href]; | |
spans[i].innerHTML = | |
"[<a href='#_footnote_" + n + | |
"' title='View footnote' class='footnote'>" + n + "</a>]"; | |
} | |
} | |
} | |
}, | |
install: function(toclevels) { | |
var timerId; | |
function reinstall() { | |
asciidoc.footnotes(); | |
if (toclevels) { | |
asciidoc.toc(toclevels); | |
} | |
} | |
function reinstallAndRemoveTimer() { | |
clearInterval(timerId); | |
reinstall(); | |
} | |
timerId = setInterval(reinstall, 500); | |
if (document.addEventListener) | |
document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false); | |
else | |
window.onload = reinstallAndRemoveTimer; | |
} | |
} | |
asciidoc.install(); | |
/*]]>*/ | |
</script> | |
</head> | |
<body class="manpage"> | |
<div id="header"> | |
<h1> | |
git-status(1) Manual Page | |
</h1> | |
<h2>NAME</h2> | |
<div class="sectionbody"> | |
<p>git-status - | |
Show the working tree status | |
</p> | |
</div> | |
</div> | |
<div id="content"> | |
<div class="sect1"> | |
<h2 id="_synopsis">SYNOPSIS</h2> | |
<div class="sectionbody"> | |
<div class="verseblock"> | |
<pre class="content"><em>git status</em> [<options>…] [--] [<pathspec>…]</pre> | |
<div class="attribution"> | |
</div></div> | |
</div> | |
</div> | |
<div class="sect1"> | |
<h2 id="_description">DESCRIPTION</h2> | |
<div class="sectionbody"> | |
<div class="paragraph"><p>Displays paths that have differences between the index file and the | |
current HEAD commit, paths that have differences between the working | |
tree and the index file, and paths in the working tree that are not | |
tracked by Git (and are not ignored by <a href="gitignore.html">gitignore(5)</a>). The first | |
are what you <em>would</em> commit by running <code>git commit</code>; the second and | |
third are what you <em>could</em> commit by running <em>git add</em> before running | |
<code>git commit</code>.</p></div> | |
</div> | |
</div> | |
<div class="sect1"> | |
<h2 id="_options">OPTIONS</h2> | |
<div class="sectionbody"> | |
<div class="dlist"><dl> | |
<dt class="hdlist1"> | |
-s | |
</dt> | |
<dt class="hdlist1"> | |
--short | |
</dt> | |
<dd> | |
<p> | |
Give the output in the short-format. | |
</p> | |
</dd> | |
<dt class="hdlist1"> | |
-b | |
</dt> | |
<dt class="hdlist1"> | |
--branch | |
</dt> | |
<dd> | |
<p> | |
Show the branch and tracking info even in short-format. | |
</p> | |
</dd> | |
<dt class="hdlist1"> | |
--porcelain | |
</dt> | |
<dd> | |
<p> | |
Give the output in an easy-to-parse format for scripts. | |
This is similar to the short output, but will remain stable | |
across Git versions and regardless of user configuration. See | |
below for details. | |
</p> | |
</dd> | |
<dt class="hdlist1"> | |
--long | |
</dt> | |
<dd> | |
<p> | |
Give the output in the long-format. This is the default. | |
</p> | |
</dd> | |
<dt class="hdlist1"> | |
-v | |
</dt> | |
<dt class="hdlist1"> | |
--verbose | |
</dt> | |
<dd> | |
<p> | |
In addition to the names of files that have been changed, also | |
show the textual changes that are staged to be committed | |
(i.e., like the output of <code>git diff --cached</code>). If <code>-v</code> is specified | |
twice, then also show the changes in the working tree that | |
have not yet been staged (i.e., like the output of <code>git diff</code>). | |
</p> | |
</dd> | |
<dt class="hdlist1"> | |
-u[<mode>] | |
</dt> | |
<dt class="hdlist1"> | |
--untracked-files[=<mode>] | |
</dt> | |
<dd> | |
<p> | |
Show untracked files. | |
</p> | |
<div class="paragraph"><p>The mode parameter is used to specify the handling of untracked files. | |
It is optional: it defaults to <em>all</em>, and if specified, it must be | |
stuck to the option (e.g. <code>-uno</code>, but not <code>-u no</code>).</p></div> | |
<div class="paragraph"><p>The possible options are:</p></div> | |
<div class="ulist"><ul> | |
<li> | |
<p> | |
<em>no</em> - Show no untracked files. | |
</p> | |
</li> | |
<li> | |
<p> | |
<em>normal</em> - Shows untracked files and directories. | |
</p> | |
</li> | |
<li> | |
<p> | |
<em>all</em> - Also shows individual files in untracked directories. | |
</p> | |
<div class="paragraph"><p>When <code>-u</code> option is not used, untracked files and directories are | |
shown (i.e. the same as specifying <code>normal</code>), to help you avoid | |
forgetting to add newly created files. Because it takes extra work | |
to find untracked files in the filesystem, this mode may take some | |
time in a large working tree. | |
Consider enabling untracked cache and split index if supported (see | |
<code>git update-index --untracked-cache</code> and <code>git update-index | |
--split-index</code>), Otherwise you can use <code>no</code> to have <code>git status</code> | |
return more quickly without showing untracked files.</p></div> | |
<div class="paragraph"><p>The default can be changed using the status.showUntrackedFiles | |
configuration variable documented in <a href="git-config.html">git-config(1)</a>.</p></div> | |
</li> | |
</ul></div> | |
</dd> | |
<dt class="hdlist1"> | |
--ignore-submodules[=<when>] | |
</dt> | |
<dd> | |
<p> | |
Ignore changes to submodules when looking for changes. <when> can be | |
either "none", "untracked", "dirty" or "all", which is the default. | |
Using "none" will consider the submodule modified when it either contains | |
untracked or modified files or its HEAD differs from the commit recorded | |
in the superproject and can be used to override any settings of the | |
<em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When | |
"untracked" is used submodules are not considered dirty when they only | |
contain untracked content (but they are still scanned for modified | |
content). Using "dirty" ignores all changes to the work tree of submodules, | |
only changes to the commits stored in the superproject are shown (this was | |
the behavior before 1.7.0). Using "all" hides all changes to submodules | |
(and suppresses the output of submodule summaries when the config option | |
<code>status.submoduleSummary</code> is set). | |
</p> | |
</dd> | |
<dt class="hdlist1"> | |
--ignored | |
</dt> | |
<dd> | |
<p> | |
Show ignored files as well. | |
</p> | |
</dd> | |
<dt class="hdlist1"> | |
-z | |
</dt> | |
<dd> | |
<p> | |
Terminate entries with NUL, instead of LF. This implies | |
the <code>--porcelain</code> output format if no other format is given. | |
</p> | |
</dd> | |
<dt class="hdlist1"> | |
--column[=<options>] | |
</dt> | |
<dt class="hdlist1"> | |
--no-column | |
</dt> | |
<dd> | |
<p> | |
Display untracked files in columns. See configuration variable | |
column.status for option syntax.<code>--column</code> and <code>--no-column</code> | |
without options are equivalent to <em>always</em> and <em>never</em> | |
respectively. | |
</p> | |
</dd> | |
</dl></div> | |
</div> | |
</div> | |
<div class="sect1"> | |
<h2 id="_output">OUTPUT</h2> | |
<div class="sectionbody"> | |
<div class="paragraph"><p>The output from this command is designed to be used as a commit | |
template comment. | |
The default, long format, is designed to be human readable, | |
verbose and descriptive. Its contents and format are subject to change | |
at any time.</p></div> | |
<div class="paragraph"><p>The paths mentioned in the output, unlike many other Git commands, are | |
made relative to the current directory if you are working in a | |
subdirectory (this is on purpose, to help cutting and pasting). See | |
the status.relativePaths config option below.</p></div> | |
<div class="sect2"> | |
<h3 id="_short_format">Short Format</h3> | |
<div class="paragraph"><p>In the short-format, the status of each path is shown as</p></div> | |
<div class="literalblock"> | |
<div class="content"> | |
<pre><code>XY PATH1 -> PATH2</code></pre> | |
</div></div> | |
<div class="paragraph"><p>where <code>PATH1</code> is the path in the <code>HEAD</code>, and the " <code>-> PATH2</code>" part is | |
shown only when <code>PATH1</code> corresponds to a different path in the | |
index/worktree (i.e. the file is renamed). The <code>XY</code> is a two-letter | |
status code.</p></div> | |
<div class="paragraph"><p>The fields (including the <code>-></code>) are separated from each other by a | |
single space. If a filename contains whitespace or other nonprintable | |
characters, that field will be quoted in the manner of a C string | |
literal: surrounded by ASCII double quote (34) characters, and with | |
interior special characters backslash-escaped.</p></div> | |
<div class="paragraph"><p>For paths with merge conflicts, <code>X</code> and <code>Y</code> show the modification | |
states of each side of the merge. For paths that do not have merge | |
conflicts, <code>X</code> shows the status of the index, and <code>Y</code> shows the status | |
of the work tree. For untracked paths, <code>XY</code> are <code>??</code>. Other status | |
codes can be interpreted as follows:</p></div> | |
<div class="ulist"><ul> | |
<li> | |
<p> | |
' ' = unmodified | |
</p> | |
</li> | |
<li> | |
<p> | |
<em>M</em> = modified | |
</p> | |
</li> | |
<li> | |
<p> | |
<em>A</em> = added | |
</p> | |
</li> | |
<li> | |
<p> | |
<em>D</em> = deleted | |
</p> | |
</li> | |
<li> | |
<p> | |
<em>R</em> = renamed | |
</p> | |
</li> | |
<li> | |
<p> | |
<em>C</em> = copied | |
</p> | |
</li> | |
<li> | |
<p> | |
<em>U</em> = updated but unmerged | |
</p> | |
</li> | |
</ul></div> | |
<div class="paragraph"><p>Ignored files are not listed, unless <code>--ignored</code> option is in effect, | |
in which case <code>XY</code> are <code>!!</code>.</p></div> | |
<div class="literalblock"> | |
<div class="content"> | |
<pre><code>X Y Meaning | |
------------------------------------------------- | |
[MD] not updated | |
M [ MD] updated in index | |
A [ MD] added to index | |
D [ M] deleted from index | |
R [ MD] renamed in index | |
C [ MD] copied in index | |
[MARC] index and work tree matches | |
[ MARC] M work tree changed since index | |
[ MARC] D deleted in work tree | |
------------------------------------------------- | |
D D unmerged, both deleted | |
A U unmerged, added by us | |
U D unmerged, deleted by them | |
U A unmerged, added by them | |
D U unmerged, deleted by us | |
A A unmerged, both added | |
U U unmerged, both modified | |
------------------------------------------------- | |
? ? untracked | |
! ! ignored | |
-------------------------------------------------</code></pre> | |
</div></div> | |
<div class="paragraph"><p>If -b is used the short-format status is preceded by a line</p></div> | |
<div class="paragraph"><p>## branchname tracking info</p></div> | |
</div> | |
<div class="sect2"> | |
<h3 id="_porcelain_format">Porcelain Format</h3> | |
<div class="paragraph"><p>The porcelain format is similar to the short format, but is guaranteed | |
not to change in a backwards-incompatible way between Git versions or | |
based on user configuration. This makes it ideal for parsing by scripts. | |
The description of the short format above also describes the porcelain | |
format, with a few exceptions:</p></div> | |
<div class="olist arabic"><ol class="arabic"> | |
<li> | |
<p> | |
The user’s color.status configuration is not respected; color will | |
always be off. | |
</p> | |
</li> | |
<li> | |
<p> | |
The user’s status.relativePaths configuration is not respected; paths | |
shown will always be relative to the repository root. | |
</p> | |
</li> | |
</ol></div> | |
<div class="paragraph"><p>There is also an alternate -z format recommended for machine parsing. In | |
that format, the status field is the same, but some other things | |
change. First, the <em>-></em> is omitted from rename entries and the field | |
order is reversed (e.g <em>from -> to</em> becomes <em>to from</em>). Second, a NUL | |
(ASCII 0) follows each filename, replacing space as a field separator | |
and the terminating newline (but a space still separates the status | |
field from the first filename). Third, filenames containing special | |
characters are not specially formatted; no quoting or | |
backslash-escaping is performed.</p></div> | |
</div> | |
</div> | |
</div> | |
<div class="sect1"> | |
<h2 id="_configuration">CONFIGURATION</h2> | |
<div class="sectionbody"> | |
<div class="paragraph"><p>The command honors <code>color.status</code> (or <code>status.color</code> — they | |
mean the same thing and the latter is kept for backward | |
compatibility) and <code>color.status.<slot></code> configuration variables | |
to colorize its output.</p></div> | |
<div class="paragraph"><p>If the config variable <code>status.relativePaths</code> is set to false, then all | |
paths shown are relative to the repository root, not to the current | |
directory.</p></div> | |
<div class="paragraph"><p>If <code>status.submoduleSummary</code> is set to a non zero number or true (identical | |
to -1 or an unlimited number), the submodule summary will be enabled for | |
the long format and a summary of commits for modified submodules will be | |
shown (see --summary-limit option of <a href="git-submodule.html">git-submodule(1)</a>). Please note | |
that the summary output from the status command will be suppressed for all | |
submodules when <code>diff.ignoreSubmodules</code> is set to <em>all</em> or only for those | |
submodules where <code>submodule.<name>.ignore=all</code>. To also view the summary for | |
ignored submodules you can either use the --ignore-submodules=dirty command | |
line option or the <em>git submodule summary</em> command, which shows a similar | |
output but does not honor these settings.</p></div> | |
</div> | |
</div> | |
<div class="sect1"> | |
<h2 id="_see_also">SEE ALSO</h2> | |
<div class="sectionbody"> | |
<div class="paragraph"><p><a href="gitignore.html">gitignore(5)</a></p></div> | |
</div> | |
</div> | |
<div class="sect1"> | |
<h2 id="_git">GIT</h2> | |
<div class="sectionbody"> | |
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> | |
</div> | |
</div> | |
</div> | |
<div id="footnotes"><hr /></div> | |
<div id="footer"> | |
<div id="footer-text"> | |
Last updated 2015-10-05 13:38:43 PDT | |
</div> | |
</div> | |
</body> | |
</html> |