git-gc: do not run git-prune by default.

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