Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'bc/cocci' | Junio C Hamano | 2016-07-19 |
|\ | |||
| * | diff: convert struct diff_filespec to struct object_id | brian m. carlson | 2016-06-28 |
* | | Merge branch 'dk/blame-move-no-reason-for-1-line-context' | Junio C Hamano | 2016-07-19 |
|\ \ | |||
| * | | blame: require 0 context lines while finding moved lines with -M | David Kastrup | 2016-05-29 |
| |/ | |||
* | | Merge branch 'jk/string-list-static-init' | Junio C Hamano | 2016-07-06 |
|\ \ | |||
| * | | use string_list initializer consistently | Jeff King | 2016-06-13 |
| * | | Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init | Junio C Hamano | 2016-06-13 |
| |\ \ | | |/ | |/| | |||
| | * | blame,shortlog: don't make local option variables static | Jeff King | 2016-06-13 |
* | | | Merge branch 'jc/deref-tag' | Junio C Hamano | 2016-06-27 |
|\ \ \ | |||
| * | | | blame, line-log: do not loop around deref_tag() | Junio C Hamano | 2016-06-14 |
* | | | | pathspec: rename free_pathspec() to clear_pathspec() | Junio C Hamano | 2016-06-02 |
| |/ / |/| | | |||
* | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' | Junio C Hamano | 2016-04-13 |
|\ \ \ | |||
| * | | | correct blame for files commited with CRLF | Torsten Bögershausen | 2016-04-05 |
| |/ / | |||
* | | | Merge branch 'jk/tighten-alloc' | Junio C Hamano | 2016-02-26 |
|\ \ \ | |||
| * | | | convert trivial cases to FLEX_ARRAY macros | Jeff King | 2016-02-22 |
| * | | | convert trivial cases to ALLOC_ARRAY | Jeff King | 2016-02-22 |
* | | | | Merge branch 'nd/ita-cleanup' | Junio C Hamano | 2016-01-20 |
|\ \ \ \ | |||
| * | | | | blame: remove obsolete comment | Nguyễn Thái Ngọc Duy | 2015-08-25 |
* | | | | | Merge branch 'ea/blame-progress' | Junio C Hamano | 2016-01-12 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||
| * | | | | blame: add support for --[no-]progress option | Edmundo Carmona Antoranz | 2015-12-16 |
| | |_|/ | |/| | | |||
| * | | | Merge branch 'mk/blame-error-message' into maint | Junio C Hamano | 2015-11-03 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'jk/blame-first-parent' into maint | Junio C Hamano | 2015-10-16 |
| |\ \ \ \ | |||
* | \ \ \ \ | 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 |