Merge git://github.com/git-l10n/git-po

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 277e1e2ca31f1b3a8d5a32d9955ff22ecd82ec37..67e5f53a9ef00991954b6bf95286a418c7e4af23 100644 (file)
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -77,6 +77,13 @@ configuration variable documented in linkgit:git-config[1].
        Terminate entries with NUL, instead of LF.  This implies
        the `--porcelain` output format if no other format is given.
 
+--column[=<options>]::
+--no-column::
+       Display untracked files in columns. See configuration variable
+       column.status for option syntax.`--column` and `--no-column`
+       without options are equivalent to 'always' and 'never'
+       respectively.
+
 
 OUTPUT
 ------