Merge branch 'pj/portable' into next

diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt
index 97eef22ccd5fe506e975057afbfef770af0814e9..2a1e526c6a1a92ea81a14b171ac8200890277fd1 100644 (file)
--- a/Documentation/git-checkout-index.txt
+++ b/Documentation/git-checkout-index.txt
@@ -8,8 +8,9 @@ git-checkout-index - Copy files from the index to the working directory
 
 SYNOPSIS
 --------
+[verse]
 'git-checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
-                  [--] <file>...
+                  [--stage=<number>] [--] <file>...
 
 DESCRIPTION
 -----------
@@ -40,6 +41,10 @@ OPTIONS
        When creating files, prepend <string> (usually a directory
        including a trailing /)
 
+--stage=<number>::
+       Instead of checking out unmerged entries, copy out the
+       files from named stage.  <number> must be between 1 and 3.
+
 --::
        Do not interpret any more arguments as options.