Merge branch 'maint-1.6.1' into maint-1.6.2

* maint-1.6.1:
ls-tree manpage: output of ls-tree is compatible with update-index
ls-tree manpage: use "unless" instead of "when ... is not"

diff --combined Documentation/git-ls-tree.txt
index f68e5c5c1abd15350e679eebf976f0ac8516123b,237073103eb552e3ec061491d9ec7fac082fb664..c3fdccb4c2f66b8b3a3c6b60b21feac881b06cb4
--- 1/Documentation/git-ls-tree.txt
--- 2/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@@ -61,7 -61,7 +61,7 @@@ OPTION
  
  --abbrev[=<n>]::
        Instead of showing the full 40-byte hexadecimal object
 -      lines, show only handful hexdigits prefix.
 +      lines, show only a partial prefix.
        Non default number of digits can be specified with --abbrev=<n>.
  
  --full-name::
@@@ -82,8 -82,10 +82,10 @@@ Output Forma
  -------------
          <mode> SP <type> SP <object> TAB <file>
  
- When the `-z` option is not used, TAB, LF, and backslash characters
+ Unless the `-z` option is used, TAB, LF, and backslash characters
  in pathnames are represented as `\t`, `\n`, and `\\`, respectively.
+ This output format is compatible with what '--index-info --stdin' of
+ 'git update-index' expects.
  
  When the `-l` option is used, format changes to