summaryrefslogtreecommitdiff
path: root/pretty.c
Commit message (Expand)AuthorAgeFilesLines
* format-patch: print in-body "From" only when neededjk/format-patch-fromJeff King2013-09-201-1/+1
* teach format-patch to place other authors into in-body "From"Jeff King2013-07-031-0/+38
* pretty.c: drop const-ness from pretty_print_contextJeff King2013-07-031-5/+5
* Merge branch 'rs/pp-user-info-without-extra-allocation'Junio C Hamano2013-05-011-35/+14
|\
| * pretty: remove intermediate strbufs from pp_user_info()René Scharfe2013-04-251-20/+9
| * pretty: simplify output line length calculation in pp_user_info()René Scharfe2013-04-251-4/+3
| * pretty: simplify input line length calculation in pp_user_info()René Scharfe2013-04-251-11/+2
* | Merge branch 'nd/pretty-formats'Junio C Hamano2013-04-231-62/+296
|\ \
| * | pretty: support %>> that steal trailing spacesNguyễn Thái Ngọc Duy2013-04-181-0/+34
| * | pretty: support truncating in %>, %< and %><Nguyễn Thái Ngọc Duy2013-04-181-3/+48
| * | pretty: support padding placeholders, %< %> and %><Nguyễn Thái Ngọc Duy2013-04-181-1/+116
| * | pretty: add %C(auto) for auto-coloringNguyễn Thái Ngọc Duy2013-04-181-3/+23
| * | pretty: split color parsing into a separate functionNguyễn Thái Ngọc Duy2013-04-181-32/+39
| * | pretty: two phase conversion for non utf-8 commitsNguyễn Thái Ngọc Duy2013-04-181-2/+22
| * | pretty: share code between format_decoration and show_decorationsNguyễn Thái Ngọc Duy2013-04-181-18/+2
| * | pretty: get the correct encoding for --pretty:format=%eNguyễn Thái Ngọc Duy2013-04-181-6/+7
| * | pretty: save commit encoding from logmsg_reencode if the caller needs itNguyễn Thái Ngọc Duy2013-04-181-4/+12
* | | Merge branch 'jk/chopped-ident'Junio C Hamano2013-04-221-21/+24
|\ \ \ | |/ / |/| / | |/
| * pretty: handle broken commit headers gracefullyRené Scharfe2013-04-171-21/+24
| * Merge branch 'mg/gpg-interface-using-status' into maintJunio C Hamano2013-04-031-4/+15
| |\
| * \ Merge branch 'ks/rfc2047-one-char-at-a-time' into maintJunio C Hamano2013-04-031-12/+22
| |\ \
* | | | pretty printing: extend %G? to include 'N' and 'U'Sebastian Götte2013-03-311-0/+2
* | | | Move commit GPG signature verification to commit.cSebastian Götte2013-03-311-78/+13
* | | | Merge branch 'ks/rfc2047-one-char-at-a-time'Junio C Hamano2013-03-251-12/+22
|\ \ \ \ | | |/ / | |/| |
| * | | format-patch: RFC 2047 says multi-octet character may not be splitKirill Smelkov2013-03-091-12/+22
* | | | Merge branch 'mg/gpg-interface-using-status'Junio C Hamano2013-03-211-4/+15
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | pretty: make %GK output the signing key for signed commitsMichael J Gruber2013-02-141-1/+8
| * | pretty: parse the gpg status lines rather than the outputMichael J Gruber2013-02-141-5/+9
| * | gpg_interface: allow to request status returnMichael J Gruber2013-02-141-1/+1
| * | Merge branch 'jc/same-encoding' into maintJunio C Hamano2013-01-101-12/+4
| |\ \
* | | | logmsg_reencode: lazily load missing commit buffersJeff King2013-01-261-8/+49
* | | | logmsg_reencode: never return NULLJeff King2013-01-261-16/+22
* | | | Merge branch 'ap/log-mailmap'Junio C Hamano2013-01-201-50/+64
|\ \ \ \
| * | | | pretty: use mailmap to display username and emailAntoine Pelisse2013-01-101-21/+37
| * | | | mailmap: simplify map_user() interfaceAntoine Pelisse2013-01-101-22/+13
| * | | | Use split_ident_line to parse author and committerAntoine Pelisse2013-01-071-14/+21
| |/ / /
* | | | Merge branch 'rs/pretty-use-prefixcmp'Junio C Hamano2013-01-181-4/+4
|\ \ \ \
| * | | | pretty: use prefixcmp instead of memcmp on NUL-terminated stringsRené Scharfe2013-01-141-4/+4
* | | | | Merge branch 'jc/format-color-auto'Junio C Hamano2013-01-051-3/+10
|\ \ \ \ \ | |/ / / /
| * | | | log --format: teach %C(auto,black) to respect color configJunio C Hamano2012-12-171-3/+10
| | |_|/ | |/| |
| * | | Merge branch 'jc/same-encoding' into maintJunio C Hamano2012-12-071-1/+1
| |\ \ \
* | \ \ \ Merge branch 'jc/same-encoding'Junio C Hamano2013-01-031-12/+4
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | format_commit_message(): simplify calls to logmsg_reencode()Junio C Hamano2012-12-101-12/+4
| | |/ | |/|
* | | Merge branch 'jc/prettier-pretty-note'Junio C Hamano2012-11-151-18/+4
|\ \ \
| * | | pretty_print_commit(): do not append notes messageJunio C Hamano2012-10-171-3/+0
| * | | pretty: prepare notes message at a centralized placeJunio C Hamano2012-10-171-5/+4
| * | | format_note(): simplify APIJunio C Hamano2012-10-171-3/+2
| * | | pretty: remove reencode_commit_message()Junio C Hamano2012-10-171-11/+2
* | | | Merge branch 'jc/same-encoding'Junio C Hamano2012-11-151-1/+1
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | reencode_string(): introduce and use same_encoding()Junio C Hamano2012-11-041-1/+1
| |/