Document git-ls-tree --full-tree

Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index 4c7262f1cd82ca8d9ea6be638d23b18d9bba3738..db6ebccd6dc51d9f1463710f29a8f821f13fd412 100644 (file)
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git ls-tree' [-d] [-r] [-t] [-l] [-z]
 --------
 [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
            <tree-ish> [paths...]
 
 DESCRIPTION


@@ -30,6 +30,8 @@ in the current working directory.  Note that:
    '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.
    '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
 -------
 
 OPTIONS
 -------


@@ -66,6 +68,10 @@ OPTIONS
        Instead of showing the path names relative to the current working
        directory, show the full path names.
 
        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
 paths::
        When paths are given, show them (note that this isn't really raw
        pathnames, but rather a list of patterns to match).  Otherwise

diff --git a/builtin-ls-tree.c b/builtin-ls-tree.c
index c386aa57546ab3ba676d74cfebf048d3a0cc3826..5b63e6eada5cd6de764acef694da624a70ce6dab 100644 (file)
--- a/builtin-ls-tree.c
+++ b/builtin-ls-tree.c
@@ -23,7 +23,7 @@ static int chomp_prefix;
 static const char *ls_tree_prefix;
 
 static const char ls_tree_usage[] =
 static const char *ls_tree_prefix;
 
 static const char ls_tree_usage[] =

-       "git ls-tree [-d] [-r] [-t] [-l] [-z] [--name-only] [--name-status] [--full-name] [--abbrev[=<n>]] <tree-ish> [path...]";
+       "git ls-tree [-d] [-r] [-t] [-l] [-z] [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]] <tree-ish> [path...]";

 
 static int show_recursive(const char *base, int baselen, const char *pathname)
 {
 
 static int show_recursive(const char *base, int baselen, const char *pathname)
 {