aboutsummaryrefslogtreecommitdiff
path: root/builtin/blame.c
Commit message (Expand)AuthorAge
* 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 '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
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | blame, log: format usage strings similarly to those in documentationAlex Henrie2015-05-03
* | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git'Junio C Hamano2015-05-11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | blame: CRLF in the working tree and LF in the repoTorsten Bögershausen2015-05-03
| * | | | | move setting of object->type to alloc_* functionsJeff King2014-07-28
* | | | | | Merge branch 'es/blame-commit-info-fix'Junio C Hamano2015-02-22
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | builtin/blame: destroy initialized commit_info onlyEric Sunshine2015-02-10
* | | | | Merge branch 'ah/usage-strings'Junio C Hamano2015-02-11
|\ \ \ \ \
| * | | | | standardize usage info string formatAlex Henrie2015-01-14
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/blame-commit-label'Junio C Hamano2015-02-11
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | blame.c: fix garbled error messageLukas Fleischer2015-01-13
* | | | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-15
|/ / /
* | | Merge branch 'bb/date-iso-strict'Junio C Hamano2014-09-19
|\ \ \
| * | | pretty: provide a strict ISO 8601 date formatBeat Bolli2014-08-29
* | | | Merge branch 'sb/blame-msg-i18n'Junio C Hamano2014-09-09
|\ \ \ \ | |/ / / |/| | |
| * | | builtin/blame.c: add translation to warning about failed revision walkStefan Beller2014-08-12
| |/ /
* | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-22
|\ \ \
| * | | use commit_list_count() to count the members of commit_listsRené Scharfe2014-07-17
* | | | Merge branch 'jk/alloc-commit-id'Junio C Hamano2014-07-22
|\ \ \ \
| * | | | move setting of object->type to alloc_* functionsJeff King2014-07-13
| |/ / /
* | | | Merge branch 'maint'Junio C Hamano2014-07-21
|\ \ \ \ | | |_|/ | |/| |
| * | | use xmemdupz() to allocate copies of strings given by start and lengthRené Scharfe2014-07-21
| * | | Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano2014-07-16
| |\ \ \
| * \ \ \ Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-25
| |\ \ \ \
* | \ \ \ \ Merge branch 'nd/split-index'Junio C Hamano2014-07-16
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | cache-tree: mark istate->cache_changed on cache tree invalidationNguyễn Thái Ngọc Duy2014-06-13
* | | | | | Merge branch 'jk/commit-buffer-length'Junio C Hamano2014-07-02
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | commit: record buffer length in cacheJeff King2014-06-13
| * | | | | convert logmsg_reencode to get_commit_bufferJeff King2014-06-13
| * | | | | provide a helper to set the commit bufferJeff King2014-06-13
| * | | | | logmsg_reencode: return const bufferJeff King2014-06-12
| * | | | | do not create "struct commit" with xcallocJeff King2014-06-12
| |/ / / /
* | | | | Merge branch 'rs/blame-refactor'Junio C Hamano2014-06-25
|\ \ \ \ \
| * | | | | blame: simplify prepare_lines()René Scharfe2014-06-13
| * | | | | blame: factor out get_next_line()René Scharfe2014-06-13
| |/ / / /
* | | | | Merge branch 'bc/blame-crlf-test'Junio C Hamano2014-06-06
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | blame: correctly handle files regardless of autocrlfbrian m. carlson2014-05-08
* | | | | Merge branch 'dk/blame-reorg'Junio C Hamano2014-06-06
|\ \ \ \ \ | |_|_|/ / |/| | | |