git-clone --reference: saner handling of borrowed symrefs.

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 753fc0866d2883af59ed54fd7ca566f7694172e3..03871e5d734dc295bba92e965721f6aa4142172f 100644 (file)
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -3,12 +3,12 @@ git-status(1)
 
 NAME
 ----
-git-status - Show working tree status.
+git-status - Show the working tree status
 
 
 SYNOPSIS
 --------
-'git-status'
+'git-status' <options>...
 
 DESCRIPTION
 -----------
@@ -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