From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 16 May 2009 07:12:58 +0000 (-0700)
Subject: Merge branch 'maint-1.6.2' into maint
X-Git-Tag: v1.6.3.2~43
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/13c5833c094e3d889df8e4a4f0ff30bb874c1b14?hp=4774780ab196ff4ace780445c06c8e5bfffffc49

Merge branch 'maint-1.6.2' into maint

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

diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index f68e5c5c1a..c3fdccb4c2 100644
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -82,8 +82,10 @@ Output Format
 -------------
         <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