summaryrefslogtreecommitdiff
path: root/pretty.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/trailer-fixes' into maintJunio C Hamano2018-11-211-0/+3
|\
| * pretty, ref-filter: format %(trailers) with no_divider optionJeff King2018-08-231-0/+3
* | Merge branch 'jk/size-t'Junio C Hamano2018-08-151-1/+1
|\ \
| * | reencode_string: use size_t for string lengthsJeff King2018-07-241-1/+1
| |/
* | Merge branch 'sb/object-store-lookup'Junio C Hamano2018-08-021-2/+2
|\ \
| * | commit: add repository argument to get_cached_commit_bufferStefan Beller2018-06-291-1/+1
| * | object: add repository argument to parse_objectStefan Beller2018-06-291-1/+1
| |/
* | pretty: switch hard-coded constants to the_hash_algobrian m. carlson2018-07-161-2/+2
|/
* Merge branch 'ds/lazy-load-trees'Junio C Hamano2018-05-231-2/+3
|\
| * treewide: replace maybe_tree with accessor methodsDerrick Stolee2018-04-111-2/+3
| * treewide: rename tree to maybe_treeDerrick Stolee2018-04-111-2/+2
* | strbuf: convert strbuf_add_unique_abbrev to use struct object_idbrian m. carlson2018-03-141-4/+4
|/
* log: add option to choose which refs to decoratera/decorate-limit-refsRafael Ascensão2017-11-221-2/+2
* pretty.c: delimit "%(trailers)" arguments with ","Taylor Blau2017-10-021-5/+28
* Merge branch 'jk/trailers-parse'Junio C Hamano2017-08-261-13/+13
|\
| * pretty: support normalization options for %(trailers)Jeff King2017-08-151-3/+12
| * pretty: move trailer formatting to trailer.cJeff King2017-08-151-11/+2
| * Merge branch 'rs/pretty-add-again' into maintJunio C Hamano2017-07-101-32/+0
| |\
* | | pretty: respect color settings for %C placeholdersJeff King2017-07-131-4/+23
* | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \
| * | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
| |/ /
* | | Merge branch 'rs/pretty-add-again'Junio C Hamano2017-06-241-32/+0
|\ \ \ | | |/ | |/|
| * | pretty: recalculate duplicate short hashesrs/pretty-add-againRené Scharfe2017-06-151-32/+0
| * | Merge branch 'rs/cocci' into maintJunio C Hamano2016-10-281-7/+5
| |\ \
| * \ \ Merge branch 'rs/c-auto-resets-attributes' into maintJunio C Hamano2016-10-281-0/+2
| |\ \ \
| * \ \ \ Merge branch 'rs/hex2chr' into maintJunio C Hamano2016-09-191-8/+5
| |\ \ \ \
* | \ \ \ \ Merge branch 'bc/object-id'Junio C Hamano2017-05-291-1/+1
|\ \ \ \ \ \
| * | | | | | object: convert parse_object* to take struct object_idbrian m. carlson2017-05-081-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | timestamp_t: a new data type for timestampsJohannes Schindelin2017-04-271-1/+1
* | | | | | parse_timestamp(): specify explicitly where we parse timestampsJohannes Schindelin2017-04-231-1/+1
|/ / / / /
* | | | | Merge branch 'rs/log-email-subject'Junio C Hamano2017-03-101-3/+4
|\ \ \ \ \
| * | | | | pretty: use fmt_output_email_subject()rs/log-email-subjectRené Scharfe2017-03-011-3/+4
* | | | | | pretty: add %(trailers) format for displaying trailers of a commit messageJacob Keller2016-12-111-0/+17
|/ / / / /
* | | | | Merge branch 'mg/gpg-richer-status'Junio C Hamano2016-10-261-0/+4
|\ \ \ \ \
| * | | | | gpg-interface: use more status lettersmg/gpg-richer-statusMichael J Gruber2016-10-121-0/+4
* | | | | | Merge branch 'rs/cocci'Junio C Hamano2016-10-171-7/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | use strbuf_add_unique_abbrev() for adding short hashes, part 3René Scharfe2016-10-101-7/+5
| | |/ / / | |/| | |
* | | | | Merge branch 'rs/c-auto-resets-attributes'Junio C Hamano2016-10-061-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | pretty: avoid adding reset for %C(auto) if output is emptyrs/c-auto-resets-attributesRené Scharfe2016-09-291-1/+1
* | | | Merge branch 'rs/c-auto-resets-attributes'Junio C Hamano2016-09-261-0/+2
|\ \ \ \ | |/ / /
| * | | pretty: let %C(auto) reset all attributesRené Scharfe2016-09-191-0/+2
* | | | Merge branch 'rs/hex2chr'Junio C Hamano2016-09-121-8/+5
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | introduce hex2chr() for converting two hexadecimal digits to a characterrs/hex2chrRené Scharfe2016-09-071-8/+5
* | | Merge branch 'rs/use-strbuf-add-unique-abbrev'Junio C Hamano2016-08-121-7/+6
|\ \ \
| * | | use strbuf_add_unique_abbrev() for adding short hashesrs/use-strbuf-add-unique-abbrevRené Scharfe2016-08-061-7/+6
| |/ /
| * | Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintJunio C Hamano2016-07-281-8/+8
| |\ \
| * \ \ Merge branch 'nd/graph-width-padded' into maintJunio C Hamano2016-07-111-1/+8
| |\ \ \
| * \ \ \ Merge branch 'et/pretty-format-c-auto' into maintJunio C Hamano2016-06-271-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
* | | | | Merge branch 'js/find-commit-subject-ignore-leading-blanks'Junio C Hamano2016-07-111-8/+8
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | pretty: make the skip_blank_lines() function publicJohannes Schindelin2016-06-221-8/+8
View Lorry Controller Status