Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with 2.3.10 | Junio C Hamano | 2015-09-28 | 1 | -2/+7 |
|\ | |||||
| * | react to errors in xdi_diff | Jeff King | 2015-09-28 | 1 | -2/+7 |
| * | Merge branch 'es/blame-commit-info-fix' into maint | Junio C Hamano | 2015-03-05 | 1 | -3/+2 |
| |\ | |||||
| * \ | Merge branch 'jk/blame-commit-label' into maint | Junio C Hamano | 2015-02-24 | 1 | -5/+7 |
| |\ \ | |||||
* | \ \ | Merge branch 'ah/usage-strings' into maint | Junio C Hamano | 2015-06-16 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | blame, log: format usage strings similarly to those in documentationah/usage-strings | Alex Henrie | 2015-05-03 | 1 | -1/+1 |
* | | | | | Merge branch 'rs/janitorial' into maint | Junio C Hamano | 2015-06-16 | 1 | -12/+3 |
|\ \ \ \ \ | |||||
| * | | | | | use file_exists() to check if a file exists in the worktree | René Scharfe | 2015-05-20 | 1 | -12/+3 |
* | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | blame: CRLF in the working tree and LF in the repotb/blame-resurrect-convert-to-git | Torsten Bögershausen | 2015-05-03 | 1 | -0/+1 |
| * | | | | | move setting of object->type to alloc_* functions | Jeff King | 2014-07-28 | 1 | -1/+0 |
* | | | | | | Merge branch 'es/blame-commit-info-fix' | Junio C Hamano | 2015-02-22 | 1 | -3/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | | |||||
| * | | | | builtin/blame: destroy initialized commit_info onlyes/blame-commit-info-fix | Eric Sunshine | 2015-02-10 | 1 | -3/+2 |
* | | | | | Merge branch 'ah/usage-strings' | Junio C Hamano | 2015-02-11 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | standardize usage info string format | Alex Henrie | 2015-01-14 | 1 | -2/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jk/blame-commit-label' | Junio C Hamano | 2015-02-11 | 1 | -5/+7 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | blame.c: fix garbled error messagejk/blame-commit-label | Lukas Fleischer | 2015-01-13 | 1 | -5/+7 |
* | | | | refs.c: change resolve_ref_unsafe reading argument to be a flags field | Ronnie Sahlberg | 2014-10-15 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'bb/date-iso-strict' | Junio C Hamano | 2014-09-19 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | pretty: provide a strict ISO 8601 date formatbb/date-iso-strict | Beat Bolli | 2014-08-29 | 1 | -0/+3 |
* | | | | Merge branch 'sb/blame-msg-i18n' | Junio C Hamano | 2014-09-09 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | builtin/blame.c: add translation to warning about failed revision walksb/blame-msg-i18n | Stefan Beller | 2014-08-12 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'rs/code-cleaning' | Junio C Hamano | 2014-07-22 | 1 | -4/+1 |
|\ \ \ | |||||
| * | | | use commit_list_count() to count the members of commit_lists | René Scharfe | 2014-07-17 | 1 | -4/+1 |
* | | | | Merge branch 'jk/alloc-commit-id' | Junio C Hamano | 2014-07-22 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | move setting of object->type to alloc_* functions | Jeff King | 2014-07-13 | 1 | -1/+0 |
| |/ / / | |||||
* | | | | Merge branch 'maint' | Junio C Hamano | 2014-07-21 | 1 | -4/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | use xmemdupz() to allocate copies of strings given by start and length | René Scharfe | 2014-07-21 | 1 | -4/+1 |
| * | | | Merge branch 'jk/commit-buffer-length' into maint | Junio C Hamano | 2014-07-16 | 1 | -5/+17 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'bc/blame-crlf-test' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+0 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'nd/split-index' | Junio C Hamano | 2014-07-16 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | cache-tree: mark istate->cache_changed on cache tree invalidation | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -1/+1 |
* | | | | | | Merge branch 'jk/commit-buffer-length' | Junio C Hamano | 2014-07-02 | 1 | -5/+17 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | commit: record buffer length in cache | Jeff King | 2014-06-13 | 1 | -1/+13 |
| * | | | | | convert logmsg_reencode to get_commit_buffer | Jeff King | 2014-06-13 | 1 | -2/+2 |
| * | | | | | provide a helper to set the commit buffer | Jeff King | 2014-06-13 | 1 | -1/+1 |
| * | | | | | logmsg_reencode: return const buffer | Jeff King | 2014-06-12 | 1 | -1/+1 |
| * | | | | | do not create "struct commit" with xcalloc | Jeff King | 2014-06-12 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'rs/blame-refactor' | Junio C Hamano | 2014-06-25 | 1 | -28/+14 |
|\ \ \ \ \ | |||||
| * | | | | | blame: simplify prepare_lines()rs/blame-refactor | René Scharfe | 2014-06-13 | 1 | -13/+7 |
| * | | | | | blame: factor out get_next_line() | René Scharfe | 2014-06-13 | 1 | -18/+10 |
| |/ / / / | |||||
* | | | | | Merge branch 'bc/blame-crlf-test' | Junio C Hamano | 2014-06-06 | 1 | -1/+0 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | blame: correctly handle files regardless of autocrlfbc/blame-crlf-test | brian m. carlson | 2014-05-08 | 1 | -1/+0 |
* | | | | | Merge branch 'dk/blame-reorg' | Junio C Hamano | 2014-06-06 | 1 | -298/+567 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | blame: large-scale performance rewritedk/blame-reorg | David Kastrup | 2014-04-28 | 1 | -298/+567 |
| | |/ / | |/| | | |||||
* | | | | blame: dynamic blame_date_width for different localesjx/blame-align-relative-time | Jiang Xin | 2014-04-23 | 1 | -1/+8 |
* | | | | blame: fix broken time_buf paddings in relative timestamp | Jiang Xin | 2014-04-23 | 1 | -7/+14 |
|/ / / | |||||
* | | | Merge branch 'nd/log-show-linear-break' | Junio C Hamano | 2014-04-03 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | object.h: centralize object flag allocation | Nguyễn Thái Ngọc Duy | 2014-03-25 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'dk/blame-janitorial' | Junio C Hamano | 2014-02-27 | 1 | -51/+42 |
|\ \ \ |