Merge branch 'master' into js/diff-ni

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index e446f4812e28c733baed21e1d82098252ffbfefc..e9e193f00866f97b341eebc80ef85e6de9ca3727 100644 (file)
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -3,19 +3,19 @@ git-status(1)
 
 NAME
 ----
-git-status - Show working tree status
+git-status - Show the working tree status
 
 
 SYNOPSIS
 --------
-'git-status'
+'git-status' <options>...
 
 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-update-index' before running 'git
+commit by running 'git add' before running 'git
 commit', and the latter paths are what you _would_ commit by
 running 'git commit'.
 
@@ -23,6 +23,10 @@ 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
+shows what would be committed if the same options are given to
+`git-commit`.
+
 
 OUTPUT
 ------
@@ -30,6 +34,15 @@ The output from this command is designed to be used as a commit
 template comments, and all the output lines are prefixed with '#'.
 
 
+CONFIGURATION
+-------------
+
+The command honors `color.status` (or `status.color` -- they
+mean the same thing and the latter is kept for backward
+compatibility) and `color.status.<slot>` configuration variables
+to colorize its output.
+
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and