summaryrefslogtreecommitdiff
path: root/mergetools/tkdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-12-19 14:45:34 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-12-19 14:45:34 -0800
commitf008159fc2dec7b98e74736751d3e6ad8d9c060f (patch)
tree4db5028a52251c217533bdec9a6a09c9c4be041a /mergetools/tkdiff
parentMerge branch 'ak/commit-only-allow-empty' (diff)
parentref-filter: add support to display trailers as part of contents (diff)
downloadtgif-f008159fc2dec7b98e74736751d3e6ad8d9c060f.tar.xz
Merge branch 'jk/trailers-placeholder-in-pretty'
In addition to %(subject), %(body), "log --pretty=format:..." learned a new placeholder %(trailers). * jk/trailers-placeholder-in-pretty: ref-filter: add support to display trailers as part of contents pretty: add %(trailers) format for displaying trailers of a commit message
Diffstat (limited to 'mergetools/tkdiff')
0 files changed, 0 insertions, 0 deletions