Merge branch 'master'

diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt
index 94b283a6bf55bcbce4eefc63d133ada833f38c28..5bff4865f78101b0bb7df23b381f26d61a35a80a 100644 (file)
--- a/Documentation/git-checkout-index.txt
+++ b/Documentation/git-checkout-index.txt
@@ -18,21 +18,21 @@ Will copy all files listed from the index to the working directory
 
 OPTIONS
 -------
--u::
+-u|--index::
        update stat information for the checked out entries in
        the index file.
 
--q::
+-q|--quiet::
        be quiet if files exist or are not in the index
 
--f::
+-f|--force::
        forces overwrite of existing files
 
--a::
+-a|--all::
        checks out all files in the index.  Cannot be used
        together with explicit filenames.
 
--n::
+-n|--no-create::
        Don't checkout new files, only refresh files already checked
        out.