diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-10-07 16:27:52 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-07 16:27:52 +0900 |
| commit | 436b35942cb5198a8d5e915690e65ee1c860baf2 (patch) | |
| tree | 09adc7fff2cd846632f0ded9b9a3ac985b44f162 /t/t7610-mergetool.sh | |
| parent | Git 2.15-rc0 (diff) | |
| parent | pretty.c: delimit "%(trailers)" arguments with "," (diff) | |
| download | tgif-436b35942cb5198a8d5e915690e65ee1c860baf2.tar.xz | |
Merge branch 'tb/delimit-pretty-trailers-args-with-comma'
The feature that allows --pretty='%(trailers)' to take modifiers
like "fold" and "only" used to separate these modifiers with a
comma, i.e. "%(trailers:fold:only)", but we changed our mind and
use a comma, i.e. "%(trailers:fold,only)". Fast track this change
before this new feature becomes part of any official release.
* tb/delimit-pretty-trailers-args-with-comma:
pretty.c: delimit "%(trailers)" arguments with ","
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions