summaryrefslogtreecommitdiff
path: root/pretty.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mg/gpg-interface-using-status' into maintJunio C Hamano2013-04-031-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
| |\
* | \ Merge branch 'ks/rfc2047-one-char-at-a-time' into maintJunio C Hamano2013-04-031-12/+22
|\ \ \
| * | | format-patch: RFC 2047 says multi-octet character may not be splitKirill Smelkov2013-03-091-12/+22
* | | | 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
| |/
* | format-patch: fix rfc2047 address encoding with respect to rfc822 specialsJan H. Schönherr2012-10-181-17/+32
* | format-patch: make rfc2047 encoding more strictJan H. Schönherr2012-10-181-8/+59
* | format-patch: introduce helper function last_line_length()Jan H. Schönherr2012-10-181-12/+13
* | format-patch: do not wrap rfc2047 encoded headers too lateJan H. Schönherr2012-10-181-10/+16
* | format-patch: do not wrap non-rfc2047 headers too earlyJan H. Schönherr2012-10-181-1/+1
|/
* Merge branch 'jk/format-person-part-buffer-limit'Junio C Hamano2012-05-251-2/+4
|\
| * pretty: avoid buffer overflow in format_person_partJeff King2012-05-221-2/+4
* | Merge branch 'jk/pretty-commit-header-incomplete-line'Junio C Hamano2012-05-251-1/+4
|\ \
| * | avoid segfault when reading header of malformed commitsJeff King2012-05-221-1/+4
* | | Merge branch 'jk/maint-reflog-walk-count-vs-time'Junio C Hamano2012-05-111-0/+1
|\ \ \ | |_|/ |/| |
| * | reflog-walk: tell explicit --date=default from not having --date at allJunio C Hamano2012-05-071-3/+2
| * | log: respect date_mode_explicit with --format:%gdJeff King2012-05-041-1/+3
* | | ident.c: add split_ident_line() to parse formatted ident lineJunio C Hamano2012-03-111-44/+20
| |/ |/|
* | Merge branch 'jc/show-sig'Junio C Hamano2012-01-061-0/+86
|\ \
| * | pretty: %G[?GS] placeholdersJunio C Hamano2011-11-121-0/+86
| |/
* | pretty: give placeholders to reflog identityjk/pretty-reglog-entJeff King2011-12-161-0/+25
* | Merge branch 'nd/pretty-commit-log-message'Junio C Hamano2011-11-011-4/+6
|\ \ | |/ |/|
| * pretty.c: use original commit message if reencoding failsnd/pretty-commit-log-messageNguyễn Thái Ngọc Duy2011-10-231-1/+4
| * pretty.c: free get_header() return valueNguyễn Thái Ngọc Duy2011-10-231-4/+3
* | Merge branch 'jk/format-patch-am'Junio C Hamano2011-05-311-52/+55
|\ \
| * | format-patch: preserve subject newlines with -kJeff King2011-05-261-1/+2
| * | clean up calling conventions for pretty.c functionsJeff King2011-05-261-52/+47
| * | pretty: add pp_commit_easy function for simple callersJeff King2011-05-261-0/+7