Merge branch 'sp/doc-update-index-cacheinfo'

* sp/doc-update-index-cacheinfo:
Documentation: use single-parameter --cacheinfo in example

diff --combined Documentation/git-update-index.txt
index dfc09d93d85f5ca598447e98327518082c8e1a16,56626a005d4d2cb104a3ac8147d3d74b8d65b893..82eca6fdf6149a270bf85937f91f3e9cc453052d
--- 1/Documentation/git-update-index.txt
--- 2/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@@ -161,17 -161,6 +161,17 @@@ may not support it yet
        Only meaningful with `--stdin` or `--index-info`; paths are
        separated with NUL character instead of LF.
  
 +--split-index::
 +--no-split-index::
 +      Enable or disable split index mode. If enabled, the index is
 +      split into two files, $GIT_DIR/index and $GIT_DIR/sharedindex.<SHA-1>.
 +      Changes are accumulated in $GIT_DIR/index while the shared
 +      index file contains all index entries stays unchanged. If
 +      split-index mode is already enabled and `--split-index` is
 +      given again, all changes in $GIT_DIR/index are pushed back to
 +      the shared index file. This mode is designed for very large
 +      indexes that take a signficant amount of time to read or write.
 +
  \--::
        Do not interpret any more arguments as options.
  
@@@ -202,7 -191,7 +202,7 @@@ merging
  To pretend you have a file with mode and sha1 at path, say:
  
  ----------------
- $ git update-index --cacheinfo mode sha1 path
+ $ git update-index --cacheinfo <mode>,<sha1>,<path>
  ----------------
  
  '--info-only' is used to register files without placing them in the object