Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'bc/object-id' | Junio C Hamano | 2015-12-10 |
|\ | |||
| * | Remove get_object_hash. | brian m. carlson | 2015-11-20 |
| * | Convert struct object to object_id | brian m. carlson | 2015-11-20 |
| * | Add several uses of get_object_hash. | brian m. carlson | 2015-11-20 |
* | | Merge branch 'mk/blame-first-parent' | Jeff King | 2015-12-01 |
|\ \ | |/ |/| | |||
| * | blame: fix object casting regression | Jeff King | 2015-11-24 |
* | | Merge branch 'mk/blame-first-parent' | Junio C Hamano | 2015-11-03 |
|\ \ | |/ | |||
| * | blame: allow blame --reverse --first-parent when it makes sense | Max Kirillov | 2015-10-30 |
| * | blame: extract find_single_final | Max Kirillov | 2015-10-30 |
* | | Merge branch 'mk/blame-error-message' | Junio C Hamano | 2015-10-30 |
|\ \ | |||
| * | | blame: fix option name in error message | Max Kirillov | 2015-10-26 |
* | | | Merge branch 'jk/war-on-sprintf' | Junio C Hamano | 2015-10-20 |
|\ \ \ | |||
| * | | | avoid sprintf and strcpy with flex arrays | Jeff King | 2015-10-05 |
| * | | | use sha1_to_hex_r() instead of strcpy | Jeff King | 2015-10-05 |
* | | | | Sync with 2.6.1 | Junio C Hamano | 2015-10-05 |
|\ \ \ \ | |||
| * \ \ \ | Sync with v2.5.4 | Junio C Hamano | 2015-09-28 |
| |\ \ \ \ | | |/ / / | |/| | | | |||
| | * | | | Sync with 2.4.10 | Junio C Hamano | 2015-09-28 |
| | |\ \ \ | |||
| | | * \ \ | Sync with 2.3.10 | Junio C Hamano | 2015-09-28 |
| | | |\ \ \ | |||
| | | | * | | | react to errors in xdi_diff | Jeff King | 2015-09-28 |
| | | | * | | | Merge branch 'es/blame-commit-info-fix' into maint | Junio C Hamano | 2015-03-05 |
| | | | |\ \ \ | |||
| | | | * \ \ \ | Merge branch 'jk/blame-commit-label' into maint | Junio C Hamano | 2015-02-24 |
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | | | |||
| | | * | | | | | Merge branch 'ah/usage-strings' into maint | Junio C Hamano | 2015-06-16 |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'rs/janitorial' into maint | Junio C Hamano | 2015-06-16 |
| | | |\ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ | Merge branch 'tb/blame-resurrect-convert-to-git' into maint | Junio C Hamano | 2015-06-05 |
| | | |\ \ \ \ \ \ \ | |||
* | | | \ \ \ \ \ \ \ | Merge branch 'jk/blame-first-parent' | Junio C Hamano | 2015-10-05 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||
| * | | | | | | | | | | blame: handle --first-parent | Jeff King | 2015-09-16 |
| | |/ / / / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'jk/date-local' | Junio C Hamano | 2015-10-05 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||
| * | | | | | | | | | date: make "local" orthogonal to date format | Jeff King | 2015-09-03 |
* | | | | | | | | | | memoize common git-path "constant" files | Jeff King | 2015-08-10 |
* | | | | | | | | | | Merge branch 'jk/date-mode-format' | Junio C Hamano | 2015-08-03 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||
| * | | | | | | | | | introduce "format" date-mode | Jeff King | 2015-06-29 |
| * | | | | | | | | | convert "enum date_mode" into a struct | Jeff King | 2015-06-29 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'mh/init-delete-refs-api' | Junio C Hamano | 2015-08-03 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||
| * | | | | | | | | refs: move the remaining ref module declarations to refs.h | Michael Haggerty | 2015-06-22 |
* | | | | | | | | | Merge branch 'qn/blame-show-email' | Junio C Hamano | 2015-06-24 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||
| * | | | | | | | | blame: add blame.showEmail configuration | Quentin Neill | 2015-06-01 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'rs/janitorial' | Junio C Hamano | 2015-06-01 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| * | | | | | | | use file_exists() to check if a file exists in the worktree | René Scharfe | 2015-05-20 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'ah/usage-strings' | Junio C Hamano | 2015-06-01 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | blame, log: format usage strings similarly to those in documentation | Alex Henrie | 2015-05-03 |
* | | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git' | Junio C Hamano | 2015-05-11 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | |||
| * | | | | | blame: CRLF in the working tree and LF in the repo | Torsten Bögershausen | 2015-05-03 |
| * | | | | | move setting of object->type to alloc_* functions | Jeff King | 2014-07-28 |
* | | | | | | Merge branch 'es/blame-commit-info-fix' | Junio C Hamano | 2015-02-22 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | | |||
| * | | | | builtin/blame: destroy initialized commit_info only | Eric Sunshine | 2015-02-10 |
* | | | | | Merge branch 'ah/usage-strings' | Junio C Hamano | 2015-02-11 |
|\ \ \ \ \ | |||
| * | | | | | standardize usage info string format | Alex Henrie | 2015-01-14 |
| | |_|/ / | |/| | | | |||
* | | | | | Merge branch 'jk/blame-commit-label' | Junio C Hamano | 2015-02-11 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||
| * | | | blame.c: fix garbled error message | Lukas Fleischer | 2015-01-13 |
* | | | | refs.c: change resolve_ref_unsafe reading argument to be a flags field | Ronnie Sahlberg | 2014-10-15 |
|/ / / |