summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-04-08 20:53:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-04-08 20:53:48 (GMT)
commitc42977afe0ee826ec31ac136685fa26a55b08edb (patch)
treee0a553bf061a1cadf988f519d2bdc5d886f93a11
parentbf23fe5c37d62f37267d31d4afa1a1444f70cdac (diff)
parentacd34fd5f60ab01e871dfa3a3bb8b81828ac181d (diff)
downloadgit-c42977afe0ee826ec31ac136685fa26a55b08edb.zip
git-c42977afe0ee826ec31ac136685fa26a55b08edb.tar.gz
git-c42977afe0ee826ec31ac136685fa26a55b08edb.tar.bz2
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 8f31e2e..0240adb 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.