Merge branch 'tr/copy-revisions-from-stdin'

Junio C Hamano committed over 13 years ago

Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early part)

Junio C Hamano committed over 13 years ago

Merge branch 'ap/strbuf-humanize'

Junio C Hamano committed over 13 years ago

Merge branch 'fc/branch-upstream-color'

Junio C Hamano committed over 13 years ago

Merge branch 'mv/ssl-ftp-curl'

Junio C Hamano committed over 13 years ago

pretty: support %>> that steal trailing spaces

Nguyễn Thái Ngọc Duy committed over 13 years ago

pretty: support truncating in %>, %< and %><

Nguyễn Thái Ngọc Duy committed over 13 years ago

pretty: support padding placeholders, %< %> and %><

Nguyễn Thái Ngọc Duy committed over 13 years ago

pretty: add %C(auto) for auto-coloring

Nguyễn Thái Ngọc Duy committed over 13 years ago

pretty: split color parsing into a separate function

Nguyễn Thái Ngọc Duy committed over 13 years ago

pretty: two phase conversion for non utf-8 commits

Nguyễn Thái Ngọc Duy committed over 13 years ago

utf8.c: add reencode_string_len() that can handle NULs in string

Nguyễn Thái Ngọc Duy committed over 13 years ago

utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences

Nguyễn Thái Ngọc Duy committed over 13 years ago

utf8.c: move display_mode_esc_sequence_len() for use by other functions

Nguyễn Thái Ngọc Duy committed over 13 years ago

pretty: share code between format_decoration and show_decorations

Nguyễn Thái Ngọc Duy committed over 13 years ago

pretty-formats.txt: wrap long lines

Nguyễn Thái Ngọc Duy committed over 13 years ago

pretty: get the correct encoding for --pretty:format=%e

Nguyễn Thái Ngọc Duy committed over 13 years ago

pretty: save commit encoding from logmsg_reencode if the caller needs it

Nguyễn Thái Ngọc Duy committed over 13 years ago

Update draft release notes to 1.8.3

Junio C Hamano committed over 13 years ago

Merge branch 'maint'

Junio C Hamano committed over 13 years ago