Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge branch 'jk/blame-first-parent' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+10 | |
| |\ \ \ \ | ||||||
* | \ \ \ \ | Merge branch 'bc/object-id' | Junio C Hamano | 2015-12-10 | 1 | -28/+28 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove get_object_hash. | brian m. carlson | 2015-11-20 | 1 | -12/+12 | |
| * | | | | | | Convert struct object to object_id | brian m. carlson | 2015-11-20 | 1 | -16/+16 | |
| * | | | | | | Add several uses of get_object_hash. | brian m. carlson | 2015-11-20 | 1 | -12/+12 | |
* | | | | | | | Merge branch 'mk/blame-first-parent' | Jeff King | 2015-12-02 | 1 | -16/+14 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | blame: fix object casting regression | Jeff King | 2015-11-24 | 1 | -16/+14 | |
* | | | | | | | Merge branch 'mk/blame-first-parent' | Junio C Hamano | 2015-11-04 | 1 | -14/+47 | |
|\| | | | | | | ||||||
| * | | | | | | blame: allow blame --reverse --first-parent when it makes sense | Max Kirillov | 2015-10-30 | 1 | -2/+30 | |
| * | | | | | | blame: extract find_single_final | Max Kirillov | 2015-10-30 | 1 | -12/+17 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge branch 'mk/blame-error-message' | Junio C Hamano | 2015-10-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | blame: fix option name in error message | Max Kirillov | 2015-10-26 | 1 | -1/+1 | |
* | | | | | | Merge branch 'jk/war-on-sprintf' | Junio C Hamano | 2015-10-21 | 1 | -6/+7 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | avoid sprintf and strcpy with flex arrays | Jeff King | 2015-10-05 | 1 | -2/+3 | |
| * | | | | | | use sha1_to_hex_r() instead of strcpy | Jeff King | 2015-10-05 | 1 | -4/+4 | |
* | | | | | | | Sync with 2.6.1 | Junio C Hamano | 2015-10-05 | 1 | -2/+7 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | Sync with v2.5.4 | Junio C Hamano | 2015-09-29 | 1 | -2/+7 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | Sync with 2.4.10 | Junio C Hamano | 2015-09-29 | 1 | -2/+7 | |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | ||||||
| | | * | | | | Sync with 2.3.10 | Junio C Hamano | 2015-09-29 | 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-25 | 1 | -5/+7 | |
| | | | |\ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | ||||||
| | | * | | | | | | Merge branch 'ah/usage-strings' into maint | Junio C Hamano | 2015-06-16 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ | Merge branch 'rs/janitorial' into maint | Junio C Hamano | 2015-06-16 | 1 | -12/+3 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ | Merge branch 'tb/blame-resurrect-convert-to-git' into maint | Junio C Hamano | 2015-06-05 | 1 | -0/+1 | |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'jk/blame-first-parent' | Junio C Hamano | 2015-10-05 | 1 | -1/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | blame: handle --first-parent | Jeff King | 2015-09-16 | 1 | -1/+10 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jk/date-local' | Junio C Hamano | 2015-10-05 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | date: make "local" orthogonal to date format | Jeff King | 2015-09-04 | 1 | -1/+0 | |
* | | | | | | | | | | memoize common git-path "constant" files | Jeff King | 2015-08-11 | 1 | -4/+3 | |
* | | | | | | | | | | Merge branch 'jk/date-mode-format' | Junio C Hamano | 2015-08-03 | 1 | -5/+8 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | introduce "format" date-mode | Jeff King | 2015-06-29 | 1 | -0/+3 | |
| * | | | | | | | | | convert "enum date_mode" into a struct | Jeff King | 2015-06-29 | 1 | -5/+5 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'mh/init-delete-refs-api' | Junio C Hamano | 2015-08-03 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | refs: move the remaining ref module declarations to refs.h | Michael Haggerty | 2015-06-22 | 1 | -0/+1 | |
* | | | | | | | | | Merge branch 'qn/blame-show-email' | Junio C Hamano | 2015-06-24 | 1 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | blame: add blame.showEmail configuration | Quentin Neill | 2015-06-02 | 1 | -1/+9 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'rs/janitorial' | Junio C Hamano | 2015-06-01 | 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 'ah/usage-strings' | Junio C Hamano | 2015-06-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | blame, log: format usage strings similarly to those in documentation | Alex Henrie | 2015-05-04 | 1 | -1/+1 | |
* | | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git' | Junio C Hamano | 2015-05-11 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | ||||||
| * | | | | | blame: CRLF in the working tree and LF in the repo | 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 only | 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 message | Lukas Fleischer | 2015-01-13 | 1 | -5/+7 |