From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 May 2009 04:06:11 +0000 (-0700)
Subject: Merge branch 'maint-1.6.1' into maint-1.6.2
X-Git-Tag: v1.6.3.2~43^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/213195185c8aa09d6192b85a3f78bf46f19f51a4?ds=inline;hp=-c

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"
---

213195185c8aa09d6192b85a3f78bf46f19f51a4
diff --combined Documentation/git-ls-tree.txt
index f68e5c5c1a,237073103e..c3fdccb4c2
--- a/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