kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-status: documentation improvements 

This patch is the result of reading over git-status with an
editorial eye:

  - fix a few typo/grammatical errors
  - mention untracked output
  - present output types in the order they appear from the
    command

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2007-12-08 04:00:31 -05:00 committed by Junio C Hamano
parent 46f721c8fe
commit 2099bca9ed
1 changed files with 13 additions and 12 deletions
Documentation

25
Documentation/git-status.txt
View File

@ -12,21 +12,22 @@ SYNOPSIS


DESCRIPTION DESCRIPTION
----------- -----------
Examines paths in the working tree that has changes unrecorded Displays paths that have differences between the index file and the
to the index file, and changes between the index file and the current HEAD commit, paths that have differences between the working
current HEAD commit. The former paths are what you _could_ tree and the index file, and paths in the working tree that are not
commit by running 'git add' before running 'git tracked by git (and are not ignored by gitlink:gitignore[5]). The first
commit', and the latter paths are what you _would_ commit by are what you _would_ commit by running `git commit`; the second and
running 'git commit'. third are what you _could_ commit by running `git add` before 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 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 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.

If any paths have been touched in the working tree (that is, If any paths have been touched in the working tree (that is,
their modification times have changed) but their contents and their modification times have changed) but their contents and
permissions are identical to those in the index file, the command permissions are identical to those in the index file, the command
@ -38,10 +39,10 @@ contains many paths that have been touched but not modified.
OUTPUT OUTPUT
------ ------
The output from this command is designed to be used as a commit 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 subdirectory (this is on purpose, to help cutting and pasting). See
the status.relativePaths config option below. the status.relativePaths config option below.