summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-01 22:02:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-01 22:02:58 (GMT)
commit28714238c8d482345ca17e8dd98d8cc328de24a8 (patch)
tree9e6d014a41e4298f4bb8793f1a51f906e44d4728 /Documentation
parent18aabfaee50058237829c0aea8d4c50efd8078aa (diff)
parentee82a487f68a7c86551fb59f6176812d63be61b6 (diff)
downloadgit-28714238c8d482345ca17e8dd98d8cc328de24a8.zip
git-28714238c8d482345ca17e8dd98d8cc328de24a8.tar.gz
git-28714238c8d482345ca17e8dd98d8cc328de24a8.tar.bz2
Merge branch 'hv/trailer-formatting'
The logic to handle "trailer" related placeholders in the "--format=" mechanisms in the "log" family and "for-each-ref" family is getting unified. * hv/trailer-formatting: ref-filter: use pretty.c logic for trailers pretty.c: capture invalid trailer argument pretty.c: refactor trailer logic to `format_set_trailers_options()` t6300: use function to test trailer options
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-for-each-ref.txt8
1 files changed, 3 insertions, 5 deletions
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index 2962f85..2ae2478 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -260,11 +260,9 @@ contents:lines=N::
The first `N` lines of the message.
Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1]
-are obtained as `trailers` (or by using the historical alias
-`contents:trailers`). Non-trailer lines from the trailer block can be omitted
-with `trailers:only`. Whitespace-continuations can be removed from trailers so
-that each trailer appears on a line by itself with its full content with
-`trailers:unfold`. Both can be used together as `trailers:unfold,only`.
+are obtained as `trailers[:options]` (or by using the historical alias
+`contents:trailers[:options]`). For valid [:option] values see `trailers`
+section of linkgit:git-log[1].
For sorting purposes, fields with numeric values sort in numeric order
(`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`).