aboutsummaryrefslogtreecommitdiff
path: root/builtin/blame.c
Commit message (Expand)AuthorAge
* Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'Junio C Hamano2016-04-13
|\
| * correct blame for files commited with CRLFTorsten Bögershausen2016-04-05
* | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-26
|\ \
| * | convert trivial cases to FLEX_ARRAY macrosJeff King2016-02-22
| * | convert trivial cases to ALLOC_ARRAYJeff King2016-02-22
* | | Merge branch 'nd/ita-cleanup'Junio C Hamano2016-01-20
|\ \ \
| * | | blame: remove obsolete commentNguyễn Thái Ngọc Duy2015-08-25
* | | | Merge branch 'ea/blame-progress'Junio C Hamano2016-01-12
|\ \ \ \ | |_|/ / |/| | |
| * | | blame: add support for --[no-]progress optionEdmundo Carmona Antoranz2015-12-16
| * | | Merge branch 'mk/blame-error-message' into maintJunio C Hamano2015-11-03
| |\ \ \
| * \ \ \ Merge branch 'jk/blame-first-parent' into maintJunio C Hamano2015-10-16
| |\ \ \ \
* | \ \ \ \ Merge branch 'bc/object-id'Junio C Hamano2015-12-10
|\ \ \ \ \ \
| * | | | | | Remove get_object_hash.brian m. carlson2015-11-20
| * | | | | | Convert struct object to object_idbrian m. carlson2015-11-20
| * | | | | | Add several uses of get_object_hash.brian m. carlson2015-11-20
* | | | | | | Merge branch 'mk/blame-first-parent'Jeff King2015-12-01
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | blame: fix object casting regressionJeff King2015-11-24
* | | | | | | Merge branch 'mk/blame-first-parent'Junio C Hamano2015-11-03
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | blame: allow blame --reverse --first-parent when it makes senseMax Kirillov2015-10-30
| * | | | | | blame: extract find_single_finalMax Kirillov2015-10-30
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mk/blame-error-message'Junio C Hamano2015-10-30
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | blame: fix option name in error messageMax Kirillov2015-10-26
* | | | | | Merge branch 'jk/war-on-sprintf'Junio C Hamano2015-10-20
|\ \ \ \ \ \
| * | | | | | avoid sprintf and strcpy with flex arraysJeff King2015-10-05
| * | | | | | use sha1_to_hex_r() instead of strcpyJeff King2015-10-05
* | | | | | | Sync with 2.6.1Junio C Hamano2015-10-05
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Sync with v2.5.4Junio C Hamano2015-09-28
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Sync with 2.4.10Junio C Hamano2015-09-28
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Sync with 2.3.10Junio C Hamano2015-09-28
| | | |\ \ \ \
| | | | * | | | react to errors in xdi_diffJeff King2015-09-28
| | | | * | | | Merge branch 'es/blame-commit-info-fix' into maintJunio C Hamano2015-03-05
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch 'jk/blame-commit-label' into maintJunio C Hamano2015-02-24
| | | | |\ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | * | | | | | Merge branch 'ah/usage-strings' into maintJunio C Hamano2015-06-16
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'rs/janitorial' into maintJunio C Hamano2015-06-16
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2015-06-05
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
* | | | | | | | | | | Merge branch 'jk/blame-first-parent'Junio C Hamano2015-10-05
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | blame: handle --first-parentJeff King2015-09-16
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/date-local'Junio C Hamano2015-10-05
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | date: make "local" orthogonal to date formatJeff King2015-09-03
* | | | | | | | | | memoize common git-path "constant" filesJeff King2015-08-10
* | | | | | | | | | Merge branch 'jk/date-mode-format'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | introduce "format" date-modeJeff King2015-06-29
| * | | | | | | | | convert "enum date_mode" into a structJeff King2015-06-29
| |/ / / / / / / /
* | | | | | | | | Merge branch 'mh/init-delete-refs-api'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | refs: move the remaining ref module declarations to refs.hMichael Haggerty2015-06-22
* | | | | | | | | Merge branch 'qn/blame-show-email'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | blame: add blame.showEmail configurationQuentin Neill2015-06-01
| |/ / / / / / /
* | | | | | | | Merge branch 'rs/janitorial'Junio C Hamano2015-06-01
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | use file_exists() to check if a file exists in the worktreeRené Scharfe2015-05-20
| |/ / / / / /
* | | | | | | Merge branch 'ah/usage-strings'Junio C Hamano2015-06-01
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |