summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-04-08 13:53:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-04-08 13:53:48 -0700
commitc42977afe0ee826ec31ac136685fa26a55b08edb (patch)
treee0a553bf061a1cadf988f519d2bdc5d886f93a11
parentMerge branch 'jc/cat-file-batch-commands' (diff)
parentls-tree doc: document interaction with submodules (diff)
downloadtgif-c42977afe0ee826ec31ac136685fa26a55b08edb.tar.xz
Merge branch 'tl/ls-tree-oid-only'
Docfix. * tl/ls-tree-oid-only: ls-tree doc: document interaction with submodules
-rw-r--r--Documentation/git-ls-tree.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index 8f31e2ee9d..0240adb8ee 100644
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -151,11 +151,11 @@ names can be used:
objectmode::
The mode of the object.
objecttype::
- The type of the object (`blob` or `tree`).
+ The type of the object (`commit`, `blob` or `tree`).
objectname::
The name of the object.
objectsize[:padded]::
- The size of the object ("-" if it's a tree).
+ The size of a `blob` object ("-" if it's a `commit` or `tree`).
It also supports a padded format of size with "%(objectsize:padded)".
path::
The pathname of the object.