summaryrefslogtreecommitdiff
path: root/builtin/blame.c
Commit message (Expand)AuthorAgeFilesLines
* memoize common git-path "constant" filesjk/git-pathJeff King2015-08-101-4/+3
* Merge branch 'jk/date-mode-format'Junio C Hamano2015-08-031-5/+8
|\
| * introduce "format" date-modeJeff King2015-06-291-0/+3
| * convert "enum date_mode" into a structJeff King2015-06-291-5/+5
* | Merge branch 'mh/init-delete-refs-api'Junio C Hamano2015-08-031-0/+1
|\ \ | |/ |/|
| * refs: move the remaining ref module declarations to refs.hMichael Haggerty2015-06-221-0/+1
* | Merge branch 'qn/blame-show-email'Junio C Hamano2015-06-241-1/+9
|\ \ | |/ |/|
| * blame: add blame.showEmail configurationqn/blame-show-emailQuentin Neill2015-06-011-1/+9
* | Merge branch 'rs/janitorial'Junio C Hamano2015-06-011-12/+3
|\ \
| * | use file_exists() to check if a file exists in the worktreeRené Scharfe2015-05-201-12/+3
| |/
* | Merge branch 'ah/usage-strings'Junio C Hamano2015-06-011-1/+1
|\ \
| * | blame, log: format usage strings similarly to those in documentationah/usage-stringsAlex Henrie2015-05-031-1/+1
* | | Merge branch 'tb/blame-resurrect-convert-to-git'Junio C Hamano2015-05-111-0/+1
|\ \ \ | |_|/ |/| |
| * | blame: CRLF in the working tree and LF in the repotb/blame-resurrect-convert-to-gitTorsten Bögershausen2015-05-031-0/+1
| * | move setting of object->type to alloc_* functionsJeff King2014-07-281-1/+0
* | | Merge branch 'es/blame-commit-info-fix'Junio C Hamano2015-02-221-3/+2
|\ \ \ | |_|/ |/| |
| * | builtin/blame: destroy initialized commit_info onlyes/blame-commit-info-fixEric Sunshine2015-02-101-3/+2
* | | Merge branch 'ah/usage-strings'Junio C Hamano2015-02-111-2/+2
|\ \ \
| * | | standardize usage info string formatAlex Henrie2015-01-141-2/+2
* | | | Merge branch 'jk/blame-commit-label'Junio C Hamano2015-02-111-5/+7
|\ \ \ \ | |/ / / |/| | |
| * | | blame.c: fix garbled error messagejk/blame-commit-labelLukas Fleischer2015-01-131-5/+7
* | | | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-151-1/+1
|/ / /
* | | Merge branch 'bb/date-iso-strict'Junio C Hamano2014-09-191-0/+3
|\ \ \
| * | | pretty: provide a strict ISO 8601 date formatbb/date-iso-strictBeat Bolli2014-08-291-0/+3
* | | | Merge branch 'sb/blame-msg-i18n'Junio C Hamano2014-09-091-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | builtin/blame.c: add translation to warning about failed revision walksb/blame-msg-i18nStefan Beller2014-08-121-1/+1
| |/ /
* | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-221-4/+1
|\ \ \
| * | | use commit_list_count() to count the members of commit_listsRené Scharfe2014-07-171-4/+1
* | | | Merge branch 'jk/alloc-commit-id'Junio C Hamano2014-07-221-1/+0
|\ \ \ \
| * | | | move setting of object->type to alloc_* functionsJeff King2014-07-131-1/+0
| |/ / /
* | | | Merge branch 'maint'Junio C Hamano2014-07-211-4/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | use xmemdupz() to allocate copies of strings given by start and lengthRené Scharfe2014-07-211-4/+1
| * | | Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano2014-07-161-5/+17
| |\ \ \
| * \ \ \ Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-251-1/+0
| |\ \ \ \
* | \ \ \ \ Merge branch 'nd/split-index'Junio C Hamano2014-07-161-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | cache-tree: mark istate->cache_changed on cache tree invalidationNguyễn Thái Ngọc Duy2014-06-131-1/+1
* | | | | | Merge branch 'jk/commit-buffer-length'Junio C Hamano2014-07-021-5/+17
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | commit: record buffer length in cacheJeff King2014-06-131-1/+13
| * | | | | convert logmsg_reencode to get_commit_bufferJeff King2014-06-131-2/+2
| * | | | | provide a helper to set the commit bufferJeff King2014-06-131-1/+1
| * | | | | logmsg_reencode: return const bufferJeff King2014-06-121-1/+1
| * | | | | do not create "struct commit" with xcallocJeff King2014-06-121-1/+1
| |/ / / /
* | | | | Merge branch 'rs/blame-refactor'Junio C Hamano2014-06-251-28/+14
|\ \ \ \ \
| * | | | | blame: simplify prepare_lines()rs/blame-refactorRené Scharfe2014-06-131-13/+7
| * | | | | blame: factor out get_next_line()René Scharfe2014-06-131-18/+10
| |/ / / /
* | | | | Merge branch 'bc/blame-crlf-test'Junio C Hamano2014-06-061-1/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | blame: correctly handle files regardless of autocrlfbc/blame-crlf-testbrian m. carlson2014-05-081-1/+0
* | | | | Merge branch 'dk/blame-reorg'Junio C Hamano2014-06-061-298/+567
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | blame: large-scale performance rewritedk/blame-reorgDavid Kastrup2014-04-281-298/+567
| | |/ / | |/| |
* | | | blame: dynamic blame_date_width for different localesjx/blame-align-relative-timeJiang Xin2014-04-231-1/+8