From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 May 2009 04:05:59 +0000 (-0700)
Subject: Merge branch 'maint-1.6.0' into maint-1.6.1
X-Git-Tag: v1.6.4.1~2^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/58066bec5a2cd8f5b6bb4884c8162364374ba0c1?ds=inline;hp=-c

Merge branch 'maint-1.6.0' into maint-1.6.1

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

58066bec5a2cd8f5b6bb4884c8162364374ba0c1
diff --combined Documentation/git-ls-tree.txt
index db6ebccd6d,3f87d7266b..237073103e
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@@ -10,7 -10,7 +10,7 @@@ SYNOPSI
  --------
  [verse]
  'git ls-tree' [-d] [-r] [-t] [-l] [-z]
 -	    [--name-only] [--name-status] [--full-name] [--abbrev=[<n>]]
 +	    [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev=[<n>]]
  	    <tree-ish> [paths...]
  
  DESCRIPTION
@@@ -30,8 -30,6 +30,8 @@@ in the current working directory.  Not
     'sub/dir' in 'HEAD').  You don't want to give a tree that is not at the
     root level (e.g. 'git ls-tree -r HEAD:sub dir') in this case, as that
     would result in asking for 'sub/sub/dir' in the 'HEAD' commit.
 +   However, the current working directory can be ignored by passing
 +   --full-tree option.
  
  OPTIONS
  -------
@@@ -68,10 -66,6 +68,10 @@@
  	Instead of showing the path names relative to the current working
  	directory, show the full path names.
  
 +--full-tree::
 +	Do not limit the listing to the current working directory.
 +	Implies --full-name.
 +
  paths::
  	When paths are given, show them (note that this isn't really raw
  	pathnames, but rather a list of patterns to match).  Otherwise
@@@ -82,8 -76,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