diff options
| author |  Taylor Blau <me@ttaylorr.com> | 2017-10-01 09:18:47 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-10-02 09:22:52 +0900 |
| commit | 84ff053d47c20c9f417f857e4adac0bcd8e01f0d (patch) | |
| tree | 8d46824980c9d3082724658a22f999bc41409317 /mergetools/emerge | |
| parent | The eleventh batch for 2.15 (diff) | |
| download | tgif-84ff053d47c20c9f417f857e4adac0bcd8e01f0d.tar.xz | |
pretty.c: delimit "%(trailers)" arguments with ","
In preparation for adding consistent "%(trailers)" atom options to
`git-for-each-ref(1)`'s "--format" argument, change "%(trailers)" in
pretty.c to separate sub-arguments with a ",", instead of a ":".
Multiple sub-arguments are given either as "%(trailers:unfold,only)" or
"%(trailers:only,unfold)".
This change disambiguates between "top-level" arguments, and arguments
given to the trailers atom itself. It is consistent with the behavior of
"%(upstream)" and "%(push)" atoms.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/emerge')
0 files changed, 0 insertions, 0 deletions