Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jc/diff-populate-filespec-size-only-fix' into maint | Junio C Hamano | 2017-03-21 |
|\ | |||
| * | diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec() | Junio C Hamano | 2017-03-02 |
* | | Merge branch 'rs/swap' | Junio C Hamano | 2017-02-15 |
|\ \ | |||
| * | | diff: use SWAP macro | René Scharfe | 2017-01-30 |
| * | | use SWAP macro | René Scharfe | 2017-01-30 |
* | | | Merge branch 'jk/log-graph-name-only' | Junio C Hamano | 2017-02-10 |
|\ \ \ | |||
| * | | | diff: print line prefix for --name-only output | Jeff King | 2017-02-08 |
| * | | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maint | Junio C Hamano | 2016-08-10 |
| |\ \ \ | |||
* | | | | | use oid_to_hex_r() for converting struct object_id hashes to hex strings | René Scharfe | 2017-01-30 |
| |_|/ / |/| | | | |||
* | | | | diff: add interhunk context config option | Vegard Nossum | 2017-01-12 |
* | | | | Merge branch 'jc/retire-compaction-heuristics' | Junio C Hamano | 2017-01-10 |
|\ \ \ \ | |||
| * | | | | diff: retire "compaction" heuristics | Junio C Hamano | 2016-12-23 |
* | | | | | diff: handle --no-abbrev in no-index case | Jack Bates | 2016-12-08 |
* | | | | | Merge branch 'tk/diffcore-delta-remove-unused' | Junio C Hamano | 2016-11-17 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||
| * | | | | diffcore-delta: remove unused parameter to diffcore_count_changes() | Tobias Klauser | 2016-11-14 |
| | |_|/ | |/| | | |||
* | | | | Merge branch 'nd/ita-empty-commit' | Junio C Hamano | 2016-10-27 |
|\ \ \ \ | |||
| * | | | | diff: add --ita-[in]visible-in-index | Nguyễn Thái Ngọc Duy | 2016-10-24 |
* | | | | | Merge branch 'jk/no-looking-at-dotgit-outside-repo' | Junio C Hamano | 2016-10-27 |
|\ \ \ \ \ | |||
| * | | | | | diff: handle sha1 abbreviations outside of repository | Jeff King | 2016-10-26 |
| * | | | | | diff_aligned_abbrev: use "struct oid" | Jeff King | 2016-10-26 |
| * | | | | | diff_unique_abbrev: rename to diff_aligned_abbrev | Jeff King | 2016-10-26 |
* | | | | | | Merge branch 'lt/abbrev-auto' | Junio C Hamano | 2016-10-27 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||
| * | | | | | abbrev: prepare for new world order | Junio C Hamano | 2016-10-03 |
* | | | | | | Merge branch 'va/i18n' | Junio C Hamano | 2016-10-26 |
|\ \ \ \ \ \ | |||
| * | | | | | | i18n: diff: mark warnings for translation | Vasco Almeida | 2016-10-17 |
* | | | | | | | Merge branch 'jc/ws-error-highlight' | Junio C Hamano | 2016-10-26 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | diff: introduce diff.wsErrorHighlight option | Junio C Hamano | 2016-10-04 |
| * | | | | | | | diff.c: move ws-error-highlight parsing helpers up | Junio C Hamano | 2016-10-04 |
| * | | | | | | | diff.c: refactor parse_ws_error_highlight() | Junio C Hamano | 2016-10-04 |
* | | | | | | | | Merge branch 'jc/diff-unique-abbrev-comments' | Junio C Hamano | 2016-10-26 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||
| * | | | | | | | diff_unique_abbrev(): document its assumption and limitation | Junio C Hamano | 2016-09-30 |
| * | | | | | | | Merge branch 'js/regexec-buf' into maint | Junio C Hamano | 2016-09-29 |
| |\ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ | Merge branch 'rs/qsort' | Junio C Hamano | 2016-10-10 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | use QSORT | René Scharfe | 2016-09-29 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-10-06 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||
| * | | | | | | | | use strbuf_add_unique_abbrev() for adding short hashes, part 2 | René Scharfe | 2016-09-27 |
* | | | | | | | | | Merge branch 'js/regexec-buf' | Junio C Hamano | 2016-09-26 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||
| * | | | | | | | | regex: use regexec_buf() | Johannes Schindelin | 2016-09-21 |
| | |_|_|_|/ / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'va/i18n-more' | Junio C Hamano | 2016-09-26 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | i18n: i18n: diff: mark die messages for translation | Jean-Noël AVILA | 2016-09-21 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'mh/diff-indent-heuristic' | Junio C Hamano | 2016-09-26 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||
| * | | | | | | | blame: honor the diff heuristic options and config | Michael Haggerty | 2016-09-19 |
| * | | | | | | | diff: improve positioning of add/delete blocks in diffs | Michael Haggerty | 2016-09-19 |
| | |_|_|_|/ / | |/| | | | | | |||
* | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2016-09-19 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | cache: convert struct cache_entry to use struct object_id | brian m. carlson | 2016-09-07 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'sb/diff-cleanup' | Junio C Hamano | 2016-09-15 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||
| * | | | | | | diff: remove dead code | Stefan Beller | 2016-09-08 |
| * | | | | | | diff: omit found pointer from emit_callback | Stefan Beller | 2016-09-08 |
| * | | | | | | diff.c: use diff_options directly | Stefan Beller | 2016-09-08 |
| |/ / / / / | |||
* | | | | | | Merge branch 'jk/diff-submodule-diff-inline' | Junio C Hamano | 2016-09-12 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | |