diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:31:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:31:05 -0700 |
| commit | 3c5de5c77b0718b47010b146160ecff6309f86b5 (patch) | |
| tree | 10dfe3c6e701fab8fee60d0059a07b72cfd34c59 /builtin/merge-base.c | |
| parent | Merge branch 'sb/submodule-clone-retry' (diff) | |
| parent | color: support strike-through attribute (diff) | |
| download | tgif-3c5de5c77b0718b47010b146160ecff6309f86b5.tar.xz | |
Merge branch 'jk/ansi-color'
The output coloring scheme learned two new attributes, italic and
strike, in addition to existing bold, reverse, etc.
* jk/ansi-color:
color: support strike-through attribute
color: support "italic" attribute
color: allow "no-" for negating attributes
color: refactor parse_attr
add skip_prefix_mem helper
doc: refactor description of color format
color: fix max-size comment
Diffstat (limited to 'builtin/merge-base.c')
0 files changed, 0 insertions, 0 deletions