X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-ls-tree.txt;h=ba0438e9ad444d3647af192f3483f27a73f8e294;hb=9e48b389990c0201487e58f3bac32734a59a7e89;hp=f6e15ad7faf96ccc0b931f28f83fc5aab05d1e75;hpb=f1a7eb36b017c62d9a007b6b8660bdeec3f94f97;p=git.git

diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index f6e15ad7..ba0438e9 100644
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -1,25 +1,27 @@
 git-ls-tree(1)
 ==============
-v0.1, May 2005
 
 NAME
 ----
-git-ls-tree - Displays a tree object in human readable form
+git-ls-tree - Lists the contents of a tree object.
 
 
 SYNOPSIS
 --------
-'git-ls-tree' [-r] [-z] <tree-ish>
+'git-ls-tree' [-d] [-r] [-z] <tree-ish> [paths...]
 
 DESCRIPTION
 -----------
-Converts the tree object to a human readable (and script processable)
-form.
+Lists the contents of a tree object, like what "/bin/ls -a" does
+in the current working directory.
 
 OPTIONS
 -------
 <tree-ish>::
-	Id of a tree.
+	Id of a tree-ish.
+
+-d::
+	show only the named tree entry itself, not its children
 
 -r::
 	recurse into sub-trees
@@ -27,14 +29,24 @@ OPTIONS
 -z::
 	\0 line termination on output
 
+paths::
+	When paths are given, show them.  Otherwise implicitly
+	uses the root level of the tree as the sole path argument.
+
+
 Output Format
 -------------
-        <mode>\t	<type>\t	<object>\t	<file>
+        <mode> SP <type> SP <object> TAB <file>
+
+When `-z` option is not used, TAB, LF, and backslash characters
+in pathnames are represented as `\t`, `\n`, and `\\`,
+respectively.
 
 
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>
+Completely rewritten from scratch by Junio C Hamano <junkio@cox.net>
 
 Documentation
 --------------
@@ -42,5 +54,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite