summaryrefslogtreecommitdiff
path: root/log-tree.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/date-mode-format'Junio C Hamano2015-08-031-1/+1
|\
| * convert "enum date_mode" into a structJeff King2015-06-291-1/+1
* | Merge branch 'mh/replace-refs'Junio C Hamano2015-08-031-2/+3
|\ \ | |/ |/|
| * Allow to control where the replace refs are looked formh/replace-refsMike Hommey2015-06-121-2/+3
* | add_ref_decoration(): convert local variable original_sha1 to object_idMichael Haggerty2015-05-251-3/+3
* | add_ref_decoration(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-6/+5
* | each_ref_fn: change to take an object_id parameterMichael Haggerty2015-05-251-2/+5
|/
* Merge branch 'mg/log-decorate-HEAD'Junio C Hamano2015-05-221-10/+21
|\
| * log: do not shorten decoration names too earlymg/log-decorate-HEADJunio C Hamano2015-05-131-18/+16
| * log: decorate HEAD with branch name under --decorate=full, tooJunio C Hamano2015-05-131-5/+18
* | Merge branch 'bc/object-id'Junio C Hamano2015-05-051-1/+1
|\ \ | |/ |/|
| * commit: convert parts to struct object_idbrian m. carlson2015-03-131-1/+1
* | log: decorate HEAD with branch nameJunio C Hamano2015-03-101-9/+68
* | Merge branch 'jc/decorate-leaky-separator-color' into HEADJunio C Hamano2015-03-101-0/+1
|\ \ | |/ |/|
| * log --decorate: do not leak "commit" color into the next itemjc/decorate-leaky-separator-colorJunio C Hamano2015-03-041-0/+1
* | Merge branch 'jn/parse-config-slot'Junio C Hamano2014-10-201-4/+3
|\ \
| * | color_parse: do not mention variable name in error messagejn/parse-config-slotJeff King2014-10-141-2/+1
| * | pass config slots as pointers instead of offsetsJonathan Nieder2014-10-141-2/+2
* | | Merge branch 'hj/pretty-naked-decoration'Junio C Hamano2014-09-291-8/+9
|\ \ \
| * | | pretty: add %D format specifierhj/pretty-naked-decorationHarry Jeffery2014-09-181-8/+9
* | | | Merge branch 'jk/name-decoration-alloc'Junio C Hamano2014-09-111-15/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | log-tree: use FLEX_ARRAY in name_decorationjk/name-decoration-allocJeff King2014-08-271-1/+1
| * | | log-tree: make name_decoration hash staticJeff King2014-08-261-3/+8
| * | | log-tree: make add_name_decoration a public functionJeff King2014-08-261-11/+1
* | | | pretty: make empty userformats truly emptyjk/pretty-empty-formatJeff King2014-07-301-2/+3
| |/ / |/| |
* | | Merge branch 'cc/for-each-mergetag'Junio C Hamano2014-07-211-11/+4
|\ \ \
| * | | commit: add for_each_mergetag()cc/for-each-mergetagChristian Couder2014-07-071-11/+4
* | | | Merge branch 'zk/log-graph-showsig'Junio C Hamano2014-07-161-0/+1
|\ \ \ \
| * | | | log: fix indentation for --graph --show-signaturezk/log-graph-showsigZoltan Klinger2014-07-091-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'mg/fix-log-mergetag-color'Junio C Hamano2014-07-161-10/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | log: correctly identify mergetag signature verification statusmg/fix-log-mergetag-colorMichael J Gruber2014-07-101-10/+11
| |/ /
* | | reuse cached commit buffer when parsing signaturesjk/commit-buffer-lengthJeff King2014-06-131-1/+1
* | | commit: record buffer length in cacheJeff King2014-06-131-1/+1
* | | use get_cached_commit_buffer where appropriateJeff King2014-06-131-1/+1
* | | Merge branch 'nd/log-show-linear-break'Junio C Hamano2014-04-031-0/+4
|\ \ \
| * | | log: add --show-linear-break to help see non-linear historynd/log-show-linear-breakNguyễn Thái Ngọc Duy2014-03-251-0/+4
| | |/ | |/|
* | | rename read_replace_refs to check_replace_refsMichael Haggerty2014-02-201-1/+1
|/ /
* | Merge branch 'bc/log-decoration'Junio C Hamano2014-01-101-0/+2
|\ \ | |/
| * log: properly handle decorations with chained tagsbc/log-decorationbrian m. carlson2013-12-201-0/+2
* | Merge branch 'cc/starts-n-ends-with'Junio C Hamano2013-12-171-4/+4
|\ \
| * | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-4/+4
| |/
* | Merge branch 'jk/robustify-parse-commit'Junio C Hamano2013-12-051-3/+3
|\ \ | |/ |/|
| * log_tree_diff: die when we fail to parse a commitJeff King2013-10-241-3/+3
* | log: use true parents for diff even when rewritingThomas Rast2013-08-011-1/+1
|/
* Merge branch 'jk/format-patch-from'Junio C Hamano2013-07-151-0/+2
|\
| * teach format-patch to place other authors into in-body "From"Jeff King2013-07-031-0/+2
* | Merge branch 'as/log-output-encoding-in-user-format'Junio C Hamano2013-07-121-0/+1
|\ \ | |/ |/|
| * pretty: --format output should honor logOutputEncodingAlexey Shumkin2013-06-261-0/+1
* | Merge branch 'tr/line-log'Junio C Hamano2013-06-021-0/+4
|\ \ | |/ |/|
| * Implement line-history search (git log -L)Thomas Rast2013-03-281-0/+4