diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-08-02 09:32:48 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-08-02 09:32:48 -0700 |
commit | c7eb614c5cc4b265a53421354020634f92fc2d59 (patch) | |
tree | 8456be562fa7ff3bf5708673b5a2607834437a4e /Documentation | |
parent | 304852fc77847e649c746db95e9c4675c03ee567 (diff) | |
parent | 062aeee8aa426468817c5bea96d781289b272ced (diff) | |
download | git-c7eb614c5cc4b265a53421354020634f92fc2d59.tar.gz |
Merge branch 'jk/cat-file-batch-optim'
* jk/cat-file-batch-optim:
Revert "cat-file: split --batch input lines on whitespace"
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-cat-file.txt | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt index 3ddec0b65b..10fbc6a373 100644 --- a/Documentation/git-cat-file.txt +++ b/Documentation/git-cat-file.txt @@ -88,10 +88,8 @@ BATCH OUTPUT If `--batch` or `--batch-check` is given, `cat-file` will read objects from stdin, one per line, and print information about them. -Each line is split at the first whitespace boundary. All characters -before that whitespace are considered as a whole object name, and are -parsed as if given to linkgit:git-rev-parse[1]. Characters after that -whitespace can be accessed using the `%(rest)` atom (see below). +Each line is considered as a whole object name, and is parsed as if +given to 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 @@ -112,10 +110,6 @@ newline. The available atoms are: The size, in bytes, that the object takes up on disk. See the note about on-disk sizes in the `CAVEATS` section below. -`rest`:: - The text (if any) found after the first run of whitespace on the - input line (i.e., the "rest" of the line). - If no format is specified, the default format is `%(objectname) %(objecttype) %(objectsize)`. |