summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlga Telezhnaya <olyatelezhnaya@gmail.com>2018-02-12 08:08:54 +0000
committerJunio C Hamano <gitster@pobox.com>2018-02-12 15:03:58 -0800
commit25b40a581a6880891cd8750968c8b0e84884e9c6 (patch)
tree3c2fed05e907a20ed8a27f2b1dc0d2fb8011cb8f
parent3c15717447a88366e2200c0c0739408ad24efe1c (diff)
downloadgit-ot/cat-batch-format.tar.gz
cat-file: update of docsot/cat-batch-format
Update the docs for cat-file command. Some new formatting atoms added because of reusing ref-filter code. We do not support cat-file atoms in general formatting logic (there is just the support for cat-file), that is why some of the atoms are still explained in cat-file docs. We need to move these explanations when atoms will be supported by other commands. Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com> Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-cat-file.txt13
1 files changed, 2 insertions, 11 deletions
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index fb09cd69d6..5b234f6d15 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -186,17 +186,8 @@ linkgit:git-rev-parse[1].
You can specify the information shown for each object by using a custom
`<format>`. The `<format>` is copied literally to stdout for each
object, with placeholders of the form `%(atom)` expanded, followed by a
-newline. The available atoms are:
-
-`objectname`::
- The 40-hex object name of the object.
-
-`objecttype`::
- The type of the object (the same as `cat-file -t` reports).
-
-`objectsize`::
- The size, in bytes, of the object (the same as `cat-file -s`
- reports).
+newline. The available atoms are the same as that of
+linkgit:git-for-each-ref[1], but there are some additional ones:
`objectsize:disk`::
The size, in bytes, that the object takes up on disk. See the