summaryrefslogtreecommitdiff
path: root/builtin/blame.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/object-id'Junio C Hamano2015-12-101-28/+28
|\
| * Remove get_object_hash.brian m. carlson2015-11-201-12/+12
| * Convert struct object to object_idbrian m. carlson2015-11-201-16/+16
| * Add several uses of get_object_hash.brian m. carlson2015-11-201-12/+12
* | Merge branch 'mk/blame-first-parent'Jeff King2015-12-011-16/+14
|\ \ | |/ |/|
| * blame: fix object casting regressionJeff King2015-11-241-16/+14
* | Merge branch 'mk/blame-first-parent'Junio C Hamano2015-11-031-14/+47
|\ \ | |/
| * blame: allow blame --reverse --first-parent when it makes sensemk/blame-first-parentMax Kirillov2015-10-301-2/+30
| * blame: extract find_single_finalMax Kirillov2015-10-301-12/+17
* | Merge branch 'mk/blame-error-message'Junio C Hamano2015-10-301-1/+1
|\ \
| * | blame: fix option name in error messagemk/blame-error-messageMax Kirillov2015-10-261-1/+1
* | | Merge branch 'jk/war-on-sprintf'Junio C Hamano2015-10-201-6/+7
|\ \ \
| * | | avoid sprintf and strcpy with flex arraysJeff King2015-10-051-2/+3
| * | | use sha1_to_hex_r() instead of strcpyJeff King2015-10-051-4/+4
* | | | Sync with 2.6.1Junio C Hamano2015-10-051-2/+7
|\ \ \ \
| * \ \ \ Sync with v2.5.4Junio C Hamano2015-09-281-2/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Sync with 2.4.10Junio C Hamano2015-09-281-2/+7
| | |\ \ \
| | | * \ \ Sync with 2.3.10Junio C Hamano2015-09-281-2/+7
| | | |\ \ \
| | | | * | | react to errors in xdi_diffJeff King2015-09-281-2/+7
| | | | * | | Merge branch 'es/blame-commit-info-fix' into maintJunio C Hamano2015-03-051-3/+2
| | | | |\ \ \
| | | | * \ \ \ Merge branch 'jk/blame-commit-label' into maintJunio C Hamano2015-02-241-5/+7
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | * | | | | Merge branch 'ah/usage-strings' into maintJunio C Hamano2015-06-161-1/+1
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'rs/janitorial' into maintJunio C Hamano2015-06-161-12/+3
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2015-06-051-0/+1
| | | |\ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ Merge branch 'jk/blame-first-parent'Junio C Hamano2015-10-051-1/+10
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | blame: handle --first-parentjk/blame-first-parentJeff King2015-09-161-1/+10
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/date-local'Junio C Hamano2015-10-051-1/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | date: make "local" orthogonal to date formatJeff King2015-09-031-1/+0
* | | | | | | | | | 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
|/ / /