blob: 6c230c0c7200412b988d233352e3411a9fb813a8 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:231git-status(1)
2=============
3
4NAME
5----
Junio C Hamano7c73c662007-01-19 00:37:506git-status - Show the working tree status
Junio C Hamano1a4e8412005-12-27 08:17:237
8
9SYNOPSIS
10--------
Junio C Hamano15567bc2011-07-23 00:51:5911[verse]
Junio C Hamanoa0fae262009-12-28 09:33:5012'git status' [<options>...] [--] [<pathspec>...]
Junio C Hamano1a4e8412005-12-27 08:17:2313
14DESCRIPTION
15-----------
Junio C Hamano942b35e2007-12-09 10:19:3316Displays paths that have differences between the index file and the
17current HEAD commit, paths that have differences between the working
18tree and the index file, and paths in the working tree that are not
Junio C Hamano076ffcc2013-02-06 05:13:2119tracked by Git (and are not ignored by linkgit:gitignore[5]). The first
Junio C Hamano942b35e2007-12-09 10:19:3320are what you _would_ commit by running `git commit`; the second and
Junio C Hamano1aa40d22010-01-21 17:46:4321third are what you _could_ commit by running 'git add' before running
Junio C Hamano942b35e2007-12-09 10:19:3322`git commit`.
Junio C Hamano1a4e8412005-12-27 08:17:2323
Junio C Hamanoa0fae262009-12-28 09:33:5024OPTIONS
25-------
Junio C Hamano8fd52302006-08-10 00:18:0826
Junio C Hamanoa0fae262009-12-28 09:33:5027-s::
28--short::
29Give the output in the short-format.
30
Junio C Hamanof5de4cf2010-06-19 00:33:1731-b::
32--branch::
33Show the branch and tracking info even in short-format.
34
Junio C Hamano967cda72017-06-30 21:49:5335--show-stash::
36Show the number of entries currently stashed away.
37
Junio C Hamanocd451662016-09-13 00:54:0938--porcelain[=<version>]::
Junio C Hamanoef5a2f92011-05-31 19:53:3339Give the output in an easy-to-parse format for scripts.
40This is similar to the short output, but will remain stable
Junio C Hamano076ffcc2013-02-06 05:13:2141across Git versions and regardless of user configuration. See
Junio C Hamanoef5a2f92011-05-31 19:53:3342below for details.
Junio C Hamanocd451662016-09-13 00:54:0943+
44The version parameter is used to specify the format version.
45This is optional and defaults to the original version 'v1' format.
Junio C Hamanoa0fae262009-12-28 09:33:5046
Junio C Hamanoa1295452012-11-13 22:32:0447--long::
48Give the output in the long-format. This is the default.
49
Junio C Hamano8152abf2015-04-28 22:48:0250-v::
51--verbose::
52In addition to the names of files that have been changed, also
53show the textual changes that are staged to be committed
54(i.e., like the output of `git diff --cached`). If `-v` is specified
55twice, then also show the changes in the working tree that
56have not yet been staged (i.e., like the output of `git diff`).
57
Junio C Hamanoa0fae262009-12-28 09:33:5058-u[<mode>]::
59--untracked-files[=<mode>]::
Junio C Hamano36a4dbc2011-02-22 07:51:3260Show untracked files.
Junio C Hamanoa0fae262009-12-28 09:33:5061+
Junio C Hamano1eb56092015-10-05 20:39:5362The mode parameter is used to specify the handling of untracked files.
63It is optional: it defaults to 'all', and if specified, it must be
64stuck to the option (e.g. `-uno`, but not `-u no`).
Junio C Hamanoa0fae262009-12-28 09:33:5065+
Junio C Hamano36a4dbc2011-02-22 07:51:3266The possible options are:
67+
Junio C Hamano5e7f1312013-03-21 22:49:0168- 'no' - Show no untracked files.
69- 'normal' - Shows untracked files and directories.
Junio C Hamanoa0fae262009-12-28 09:33:5070- 'all' - Also shows individual files in untracked directories.
Junio C Hamanoa0fae262009-12-28 09:33:5071+
Junio C Hamano5e7f1312013-03-21 22:49:0172When `-u` option is not used, untracked files and directories are
73shown (i.e. the same as specifying `normal`), to help you avoid
74forgetting to add newly created files. Because it takes extra work
75to find untracked files in the filesystem, this mode may take some
Junio C Hamanoc4e2a202015-05-26 21:38:4776time in a large working tree.
77Consider enabling untracked cache and split index if supported (see
78`git update-index --untracked-cache` and `git update-index
79--split-index`), Otherwise you can use `no` to have `git status`
Junio C Hamano5e7f1312013-03-21 22:49:0180return more quickly without showing untracked files.
81+
Junio C Hamano36a4dbc2011-02-22 07:51:3282The default can be changed using the status.showUntrackedFiles
83configuration variable documented in linkgit:git-config[1].
Junio C Hamanoa0fae262009-12-28 09:33:5084
Junio C Hamano7d449522010-07-01 00:08:5185--ignore-submodules[=<when>]::
86Ignore changes to submodules when looking for changes. <when> can be
Junio C Hamano619596a2010-08-18 22:15:3587either "none", "untracked", "dirty" or "all", which is the default.
88Using "none" will consider the submodule modified when it either contains
89untracked or modified files or its HEAD differs from the commit recorded
90in the superproject and can be used to override any settings of the
91'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When
Junio C Hamano7d449522010-07-01 00:08:5192"untracked" is used submodules are not considered dirty when they only
93contain untracked content (but they are still scanned for modified
94content). Using "dirty" ignores all changes to the work tree of submodules,
95only changes to the commits stored in the superproject are shown (this was
96the behavior before 1.7.0). Using "all" hides all changes to submodules
97(and suppresses the output of submodule summaries when the config option
Junio C Hamano322c6242015-03-23 21:32:4698`status.submoduleSummary` is set).
Junio C Hamano7d449522010-07-01 00:08:5199
Junio C Hamanob72f6032017-11-15 05:57:08100--ignored[=<mode>]::
Junio C Hamano4c4b0122011-06-30 01:19:32101Show ignored files as well.
Junio C Hamanob72f6032017-11-15 05:57:08102+
103The mode parameter is used to specify the handling of ignored files.
104It is optional: it defaults to 'traditional'.
105+
106The possible options are:
107+
108- 'traditional' - Shows ignored files and directories, unless
109 --untracked-files=all is specifed, in which case
110 individual files in ignored directories are
111 displayed.
112- 'no' - Show no ignored files.
113- 'matching' - Shows ignored files and directories matching an
114 ignore pattern.
115+
116When 'matching' mode is specified, paths that explicity match an
117ignored pattern are shown. If a directory matches an ignore pattern,
118then it is shown, but not paths contained in the ignored directory. If
119a directory does not match an ignore pattern, but all contents are
120ignored, then the directory is not shown, but all contents are shown.
Junio C Hamano4c4b0122011-06-30 01:19:32121
Junio C Hamanoa0fae262009-12-28 09:33:50122-z::
123Terminate entries with NUL, instead of LF. This implies
Junio C Hamanocd451662016-09-13 00:54:09124the `--porcelain=v1` output format if no other format is given.
Junio C Hamano942b35e2007-12-09 10:19:33125
Junio C Hamano22700fb2012-05-03 23:07:25126--column[=<options>]::
127--no-column::
128Display untracked files in columns. See configuration variable
129column.status for option syntax.`--column` and `--no-column`
130without options are equivalent to 'always' and 'never'
131respectively.
132
Junio C Hamanoa25ccc42018-03-08 21:36:14133--ahead-behind::
134--no-ahead-behind::
135Display or do not display detailed ahead/behind counts for the
136branch relative to its upstream branch. Defaults to true.
137
Junio C Hamano139b7d12017-10-03 07:10:59138<pathspec>...::
139See the 'pathspec' entry in linkgit:gitglossary[7].
Junio C Hamano1a4e8412005-12-27 08:17:23140
141OUTPUT
142------
143The output from this command is designed to be used as a commit
Junio C Hamano52b6ba32014-04-01 00:26:48144template comment.
Junio C Hamanoa0fae262009-12-28 09:33:50145The default, long format, is designed to be human readable,
Junio C Hamanoef5a2f92011-05-31 19:53:33146verbose and descriptive. Its contents and format are subject to change
147at any time.
Junio C Hamano1a4e8412005-12-27 08:17:23148
Junio C Hamano076ffcc2013-02-06 05:13:21149The paths mentioned in the output, unlike many other Git commands, are
Junio C Hamano942b35e2007-12-09 10:19:33150made relative to the current directory if you are working in a
151subdirectory (this is on purpose, to help cutting and pasting). See
152the status.relativePaths config option below.
Junio C Hamano00b8b632007-12-07 09:50:49153
Junio C Hamanoef5a2f92011-05-31 19:53:33154Short Format
155~~~~~~~~~~~~
156
Junio C Hamano7b9cce92018-01-23 22:34:27157In the short-format, the status of each path is shown as one of these
158forms
Junio C Hamanoa0fae262009-12-28 09:33:50159
Junio C Hamano7b9cce92018-01-23 22:34:27160XY PATH
161XY ORIG_PATH -> PATH
Junio C Hamanoa0fae262009-12-28 09:33:50162
Junio C Hamano7b9cce92018-01-23 22:34:27163where `ORIG_PATH` is where the renamed/copied contents came
164from. `ORIG_PATH` is only shown when the entry is renamed or
165copied. The `XY` is a two-letter status code.
Junio C Hamanoa0fae262009-12-28 09:33:50166
Junio C Hamanob76a6862012-05-02 22:02:46167The fields (including the `->`) are separated from each other by a
Junio C Hamanofc5d7352010-04-24 02:59:11168single space. If a filename contains whitespace or other nonprintable
169characters, that field will be quoted in the manner of a C string
170literal: surrounded by ASCII double quote (34) characters, and with
171interior special characters backslash-escaped.
Junio C Hamanoa0fae262009-12-28 09:33:50172
Junio C Hamanod2c28482014-10-24 22:28:25173For paths with merge conflicts, `X` and `Y` show the modification
Junio C Hamanofc5d7352010-04-24 02:59:11174states of each side of the merge. For paths that do not have merge
175conflicts, `X` shows the status of the index, and `Y` shows the status
176of the work tree. For untracked paths, `XY` are `??`. Other status
177codes can be interpreted as follows:
178
179* ' ' = unmodified
180* 'M' = modified
181* 'A' = added
182* 'D' = deleted
183* 'R' = renamed
184* 'C' = copied
185* 'U' = updated but unmerged
186
Junio C Hamano4c4b0122011-06-30 01:19:32187Ignored files are not listed, unless `--ignored` option is in effect,
188in which case `XY` are `!!`.
Junio C Hamanoa0fae262009-12-28 09:33:50189
190 X Y Meaning
191 -------------------------------------------------
Junio C Hamano615c3b32018-02-28 23:40:27192 [AMD] not updated
Junio C Hamanoa0fae262009-12-28 09:33:50193 M [ MD] updated in index
194 A [ MD] added to index
Junio C Hamano615c3b32018-02-28 23:40:27195 D deleted from index
Junio C Hamanoa0fae262009-12-28 09:33:50196 R [ MD] renamed in index
197 C [ MD] copied in index
198 [MARC] index and work tree matches
199 [ MARC] M work tree changed since index
200 [ MARC] D deleted in work tree
Junio C Hamano7b9cce92018-01-23 22:34:27201 [ D] R renamed in work tree
202 [ D] C copied in work tree
Junio C Hamanoa0fae262009-12-28 09:33:50203 -------------------------------------------------
204 D D unmerged, both deleted
205 A U unmerged, added by us
206 U D unmerged, deleted by them
207 U A unmerged, added by them
208 D U unmerged, deleted by us
209 A A unmerged, both added
210 U U unmerged, both modified
211 -------------------------------------------------
212 ? ? untracked
Junio C Hamano4c4b0122011-06-30 01:19:32213 ! ! ignored
Junio C Hamanoa0fae262009-12-28 09:33:50214 -------------------------------------------------
215
Junio C Hamano52a094d2017-04-20 05:35:10216Submodules have more state and instead report
217M the submodule has a different HEAD than
218 recorded in the index
219m the submodule has modified content
220? the submodule has untracked files
221since modified content or untracked files in a submodule cannot be added
222via `git add` in the superproject to prepare a commit.
223
224'm' and '?' are applied recursively. For example if a nested submodule
225in a submodule contains an untracked file, this is reported as '?' as well.
226
Junio C Hamanof5de4cf2010-06-19 00:33:17227If -b is used the short-format status is preceded by a line
228
Junio C Hamanocd451662016-09-13 00:54:09229 ## branchname tracking info
Junio C Hamanof5de4cf2010-06-19 00:33:17230
Junio C Hamanocd451662016-09-13 00:54:09231Porcelain Format Version 1
232~~~~~~~~~~~~~~~~~~~~~~~~~~
Junio C Hamanoef5a2f92011-05-31 19:53:33233
Junio C Hamanocd451662016-09-13 00:54:09234Version 1 porcelain format is similar to the short format, but is guaranteed
Junio C Hamano076ffcc2013-02-06 05:13:21235not to change in a backwards-incompatible way between Git versions or
Junio C Hamanoef5a2f92011-05-31 19:53:33236based on user configuration. This makes it ideal for parsing by scripts.
237The description of the short format above also describes the porcelain
238format, with a few exceptions:
239
2401. The user's color.status configuration is not respected; color will
241 always be off.
242
2432. The user's status.relativePaths configuration is not respected; paths
244 shown will always be relative to the repository root.
245
246There is also an alternate -z format recommended for machine parsing. In
Junio C Hamanofc5d7352010-04-24 02:59:11247that format, the status field is the same, but some other things
Junio C Hamanoef5a2f92011-05-31 19:53:33248change. First, the '\->' is omitted from rename entries and the field
249order is reversed (e.g 'from \-> to' becomes 'to from'). Second, a NUL
Junio C Hamanofc5d7352010-04-24 02:59:11250(ASCII 0) follows each filename, replacing space as a field separator
251and the terminating newline (but a space still separates the status
252field from the first filename). Third, filenames containing special
253characters are not specially formatted; no quoting or
Junio C Hamanobcdb12e2012-05-10 18:45:15254backslash-escaping is performed.
Junio C Hamano1a4e8412005-12-27 08:17:23255
Junio C Hamano52a094d2017-04-20 05:35:10256Any submodule changes are reported as modified `M` instead of `m` or single `?`.
257
Junio C Hamanocd451662016-09-13 00:54:09258Porcelain Format Version 2
259~~~~~~~~~~~~~~~~~~~~~~~~~~
260
261Version 2 format adds more detailed information about the state of
262the worktree and changed items. Version 2 also defines an extensible
263set of easy to parse optional headers.
264
265Header lines start with "#" and are added in response to specific
266command line arguments. Parsers should ignore headers they
267don't recognize.
268
269### Branch Headers
270
271If `--branch` is given, a series of header lines are printed with
272information about the current branch.
273
274 Line Notes
275 ------------------------------------------------------------
276 # branch.oid <commit> | (initial) Current commit.
277 # branch.head <branch> | (detached) Current branch.
278 # branch.upstream <upstream_branch> If upstream is set.
279 # branch.ab +<ahead> -<behind> If upstream is set and
280 the commit is present.
281 ------------------------------------------------------------
282
283### Changed Tracked Entries
284
285Following the headers, a series of lines are printed for tracked
286entries. One of three different line formats may be used to describe
287an entry depending on the type of change. Tracked entries are printed
288in an undefined order; parsers should allow for a mixture of the 3
289line types in any order.
290
291Ordinary changed entries have the following format:
292
293 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>
294
295Renamed or copied entries have the following format:
296
297 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>
298
299 Field Meaning
300 --------------------------------------------------------
301 <XY> A 2 character field containing the staged and
302unstaged XY values described in the short format,
303with unchanged indicated by a "." rather than
304a space.
305 <sub> A 4 character field describing the submodule state.
306"N..." when the entry is not a submodule.
307"S<c><m><u>" when the entry is a submodule.
308<c> is "C" if the commit changed; otherwise ".".
309<m> is "M" if it has tracked changes; otherwise ".".
310<u> is "U" if there are untracked changes; otherwise ".".
311 <mH> The octal file mode in HEAD.
312 <mI> The octal file mode in the index.
313 <mW> The octal file mode in the worktree.
314 <hH> The object name in HEAD.
315 <hI> The object name in the index.
316 <X><score> The rename or copy score (denoting the percentage
317of similarity between the source and target of the
318move or copy). For example "R100" or "C75".
319 <path> The pathname. In a renamed/copied entry, this
Junio C Hamano7b9cce92018-01-23 22:34:27320is the target path.
Junio C Hamanocd451662016-09-13 00:54:09321 <sep> When the `-z` option is used, the 2 pathnames are separated
322with a NUL (ASCII 0x00) byte; otherwise, a tab (ASCII 0x09)
323byte separates them.
Junio C Hamano7b9cce92018-01-23 22:34:27324 <origPath> The pathname in the commit at HEAD or in the index.
325This is only present in a renamed/copied entry, and
326tells where the renamed/copied contents came from.
Junio C Hamanocd451662016-09-13 00:54:09327 --------------------------------------------------------
328
329Unmerged entries have the following format; the first character is
330a "u" to distinguish from ordinary changed entries.
331
332 u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
333
334 Field Meaning
335 --------------------------------------------------------
336 <XY> A 2 character field describing the conflict type
337as described in the short format.
338 <sub> A 4 character field describing the submodule state
339as described above.
340 <m1> The octal file mode in stage 1.
341 <m2> The octal file mode in stage 2.
342 <m3> The octal file mode in stage 3.
343 <mW> The octal file mode in the worktree.
344 <h1> The object name in stage 1.
345 <h2> The object name in stage 2.
346 <h3> The object name in stage 3.
347 <path> The pathname.
348 --------------------------------------------------------
349
350### Other Items
351
352Following the tracked entries (and if requested), a series of
353lines will be printed for untracked and then ignored items
354found in the worktree.
355
356Untracked items have the following format:
357
358 ? <path>
359
360Ignored items have the following format:
361
362 ! <path>
363
364### Pathname Format Notes and -z
365
366When the `-z` option is given, pathnames are printed as is and
367without any quoting and lines are terminated with a NUL (ASCII 0x00)
368byte.
369
Junio C Hamano0f6f3bf2017-03-13 07:01:53370Without the `-z` option, pathnames with "unusual" characters are
371quoted as explained for the configuration variable `core.quotePath`
372(see linkgit:git-config[1]).
Junio C Hamanocd451662016-09-13 00:54:09373
374
Junio C Hamanof9771f62007-01-17 17:42:30375CONFIGURATION
376-------------
377
378The command honors `color.status` (or `status.color` -- they
379mean the same thing and the latter is kept for backward
380compatibility) and `color.status.<slot>` configuration variables
381to colorize its output.
382
Junio C Hamano942b35e2007-12-09 10:19:33383If the config variable `status.relativePaths` is set to false, then all
384paths shown are relative to the repository root, not to the current
385directory.
386
Junio C Hamano322c6242015-03-23 21:32:46387If `status.submoduleSummary` is set to a non zero number or true (identical
Junio C Hamanoa0fae262009-12-28 09:33:50388to -1 or an unlimited number), the submodule summary will be enabled for
389the long format and a summary of commits for modified submodules will be
Junio C Hamano369e3402013-10-15 18:40:25390shown (see --summary-limit option of linkgit:git-submodule[1]). Please note
391that the summary output from the status command will be suppressed for all
392submodules when `diff.ignoreSubmodules` is set to 'all' or only for those
393submodules where `submodule.<name>.ignore=all`. To also view the summary for
394ignored submodules you can either use the --ignore-submodules=dirty command
395line option or the 'git submodule summary' command, which shows a similar
396output but does not honor these settings.
Junio C Hamanoe3ddb5b2008-04-21 00:48:07397
Junio C Hamano371470a2017-12-13 22:26:40398BACKGROUND REFRESH
399------------------
400
401By default, `git status` will automatically refresh the index, updating
402the cached stat information from the working tree and writing out the
403result. Writing out the updated index is an optimization that isn't
404strictly necessary (`status` computes the values for itself, but writing
405them out is just to save subsequent programs from repeating our
406computation). When `status` is run in the background, the lock held
407during the write may conflict with other simultaneous processes, causing
408them to fail. Scripts running `status` in the background should consider
409using `git --no-optional-locks status` (see linkgit:git[1] for details).
410
Junio C Hamano9049d912008-05-29 02:09:50411SEE ALSO
Junio C Hamano679d22d2007-06-02 21:13:44412--------
Junio C Hamano35738e82008-01-07 07:55:46413linkgit:gitignore[5]
Junio C Hamanof9771f62007-01-17 17:42:30414
Junio C Hamano1a4e8412005-12-27 08:17:23415GIT
416---
Junio C Hamanof7c042d2008-06-06 22:50:53417Part of the linkgit:git[1] suite