diff options
| author |  Jeff King <peff@peff.net> | 2020-09-27 04:40:07 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-09-27 12:21:05 -0700 |
| commit | f17b0b99bf2dc2fcd74544ce35d058e558e6b056 (patch) | |
| tree | 9bdcbc31e0f5d80caaa399b0ec1a5e32444b5d13 /Documentation | |
| parent | shortlog: match commit trailers with --group (diff) | |
| download | tgif-f17b0b99bf2dc2fcd74544ce35d058e558e6b056.tar.xz | |
shortlog: de-duplicate trailer values
The current documentation is vague about what happens with
--group=trailer:signed-off-by when we see a commit with:
Signed-off-by: One
Signed-off-by: Two
Signed-off-by: One
We clearly should credit both "One" and "Two", but should "One" get
credited twice? The current code does so, but mostly because that was
the easiest thing to do. It's probably more useful to count each commit
at most once. This will become especially important when we allow
values from multiple sources in a future patch.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-shortlog.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index edd6cda58a..9e94613e13 100644 --- a/Documentation/git-shortlog.txt +++ b/Documentation/git-shortlog.txt @@ -61,7 +61,8 @@ OPTIONS + Note that commits that do not include the trailer will not be counted. Likewise, commits with multiple trailers (e.g., multiple signoffs) may -be counted more than once. +be counted more than once (but only once per unique trailer value in +that commit). + The contents of each trailer value are taken literally and completely. No mailmap is applied, and the `-e` option has no effect (if the trailer |