From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Jan 2009 07:09:57 +0000 (-0800)
Subject: Merge branch 'jc/maint-ls-tree'
X-Git-Tag: v1.6.2-rc0~159
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/350b1091a83fbf42f887d538f9247b5bdfe0225f?ds=inline;hp=-c

Merge branch 'jc/maint-ls-tree'

* jc/maint-ls-tree:
Document git-ls-tree --full-tree
ls-tree: add --full-tree option
---

350b1091a83fbf42f887d538f9247b5bdfe0225f
diff --combined Documentation/git-ls-tree.txt
index 7bf76c92e4,db6ebccd6d..f68e5c5c1a
--- 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,6 -30,8 +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
  -------
@@@ -59,13 -61,17 +61,17 @@@
  
  --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::
  	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