index 645dc85ceb15c97a55faddbdab3586b39f74a60f..84f60f3407499c40a8e0caadf9d40ed5e9b8386b 100644 (file)
SYNOPSIS
--------
SYNOPSIS
--------
-'git-status' <options>...
+'git status' <options>...
DESCRIPTION
-----------
DESCRIPTION
-----------
-Examines paths in the working tree that has changes unrecorded
-to the index file, and changes between the index file and the
-current HEAD commit. The former paths are what you _could_
-commit by running 'git add' before running 'git
-commit', and the latter paths are what you _would_ commit by
-running 'git commit'.
-
-If there is no path that is different between the index file and
-the current HEAD commit, the command exits with non-zero
-status.
-
-The command takes the same set of options as `git-commit`; it
+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 linkgit:gitignore[5]). The first
+are what you _would_ commit by running `git commit`; the second and
+third are what you _could_ commit by running 'git-add' before running
+`git commit`.
+
+The command takes the same set of options as 'git-commit'; it
shows what would be committed if the same options are given to
shows what would be committed if the same options are given to
-`git-commit`.
+'git-commit'.
-If any paths have been touched in the working tree (that is,
-their modification times have changed) but their contents and
-permissions are identical to those in the index file, the command
-updates the index file. Running `git-status` can thus speed up
-subsequent operations such as `git-diff` if the working tree
-contains many paths that have been touched but not modified.
+If there is no path that is different between the index file and
+the current HEAD commit (i.e., there is nothing to commit by running
+`git commit`), the command exits with non-zero status.
OUTPUT
------
The output from this command is designed to be used as a commit
OUTPUT
------
The output from this command is designed to be used as a commit
-template comments, and all the output lines are prefixed with '#'.
+template comment, and all the output lines are prefixed with '#'.
The paths mentioned in the output, unlike many other git commands, are
The paths mentioned in the output, unlike many other git commands, are
-made relative to the current directory, if you are working in a
+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.
subdirectory (this is on purpose, to help cutting and pasting). See
the status.relativePaths config option below.
paths shown are relative to the repository root, not to the current
directory.
paths shown are relative to the repository root, not to the current
directory.
-See Also
+If `status.submodulesummary` is set to a non zero number or true (identical
+to -1 or an unlimited number), the submodule summary will be enabled and a
+summary of commits for modified submodules will be shown (see --summary-limit
+option of linkgit:git-submodule[1]).
+
+SEE ALSO
--------
--------
-gitlink:gitignore[5]
+linkgit:gitignore[5]
Author
------
Written by Linus Torvalds <torvalds@osdl.org> and
Author
------
Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>.
+Junio C Hamano <gitster@pobox.com>.
Documentation
--------------
Documentation
--------------
GIT
---
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite