From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 7 Oct 2017 07:27:52 +0000 (+0900)
Subject: Merge branch 'tb/delimit-pretty-trailers-args-with-comma'
X-Git-Tag: v2.15.0-rc1~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=436b35942cb5198a8d5e915690e65ee1c860baf2;p=thirdparty%2Fgit.git

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 ","
---

436b35942cb5198a8d5e915690e65ee1c860baf2