This series was ejected out of pu some time ago due to gcc warnings. I did not have time to look at it (and it worked ok for me so it was not a pressing matter). This re-roll should fix that. For demonstration, try git log --pretty='format:%C(auto)%h %<(80,trunc)%s%>>(10,ltrunc)%C(auto)%d%>(15,mtrunc)% an' Nguyễn Thái Ngọc Duy (12): pretty-formats.txt: wrap long lines pretty: share code between format_decoration and show_decorations utf8.c: move display_mode_esc_sequence_len() for use by other functions utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences pretty: save commit encoding from logmsg_reencode if the caller needs it pretty: get the correct encoding for --pretty:format=%e utf8: keep NULs in reencode_string() pretty: two phase conversion for non utf-8 commits pretty: add %C(auto) for auto-coloring on the next placeholder pretty: support padding placeholders, %< %> and %>< pretty: support truncating in %>, %< and %>< pretty: support %>> that steal trailing spaces Documentation/pretty-formats.txt | 34 ++++- builtin/blame.c | 2 +- builtin/commit.c | 2 +- builtin/fast-export.c | 3 +- builtin/mailinfo.c | 3 +- commit.h | 1 + compat/precompose_utf8.c | 2 +- log-tree.c | 60 +++++---- log-tree.h | 3 + notes.c | 4 +- pretty.c | 282 ++++++++++++++++++++++++++++++++++----- revision.c | 2 +- sequencer.c | 5 +- t/t4207-log-decoration-colors.sh | 8 +- t/t6006-rev-list-format.sh | 12 +- utf8.c | 104 +++++++++++---- utf8.h | 14 +- 17 files changed, 434 insertions(+), 107 deletions(-) -- 1.8.2.83.gc99314b -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html