summaryrefslogtreecommitdiff
path: root/pretty.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/pretty-G-format-fixes' into maintJunio C Hamano2014-07-161-0/+2
|\
| * pretty: avoid reading past end-of-string with "%G"Jeff King2014-06-171-0/+2
* | Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano2014-07-161-34/+16
|\ \
| * | commit: record buffer length in cacheJeff King2014-06-131-2/+2
| * | convert logmsg_reencode to get_commit_bufferJeff King2014-06-131-29/+11
| * | logmsg_reencode: return const bufferJeff King2014-06-121-7/+7
| |/
* | Merge branch 'maint-1.8.5' into maintJunio C Hamano2014-07-021-1/+1
|\ \
| * | enums: remove trailing ',' after last item in enumRonnie Sahlberg2014-07-021-1/+1
* | | pretty.c: format string with truncate respects logOutputEncodingas/pretty-truncateAlexey Shumkin2014-05-211-1/+6
| |/ |/|
* | Merge branch 'rm/strchrnul-not-strlen'Junio C Hamano2014-03-181-3/+2
|\ \
| * | use strchrnul() in place of strchr() and strlen()rm/strchrnul-not-strlenRohit Mani2014-03-101-3/+2
* | | Merge branch 'jk/commit-dates-parsing-fix'Junio C Hamano2014-03-141-3/+9
|\ \ \ | |/ / |/| |
| * | show_ident_date: fix tz range checkJeff King2014-03-071-2/+2
| * | log: handle integer overflow in timestampsJeff King2014-02-241-2/+8
* | | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-18/+18
| |/ |/|
* | pretty: trivial style fixFelipe Contreras2013-10-311-1/+1
* | 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