From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Sep 2014 18:38:39 +0000 (-0700)
Subject: Merge branch 'sp/doc-update-index-cacheinfo'
X-Git-Tag: v2.2.0-rc0~102
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9d6db4a28ddbaf66bbc257251e97e9511a9148fd?ds=inline;hp=-c

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

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

9d6db4a28ddbaf66bbc257251e97e9511a9148fd
diff --combined Documentation/git-update-index.txt
index dfc09d93d8,56626a005d..82eca6fdf6
--- a/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