Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | diff: handle sha1 abbreviations outside of repository | Jeff King | 2016-10-26 | 1 | -4/+17 | |
| * | | | | | diff_aligned_abbrev: use "struct oid" | Jeff King | 2016-10-26 | 1 | -9/+11 | |
| * | | | | | diff_unique_abbrev: rename to diff_aligned_abbrev | Jeff King | 2016-10-26 | 1 | -7/+3 | |
* | | | | | | Merge branch 'lt/abbrev-auto' | Junio C Hamano | 2016-10-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | abbrev: prepare for new world order | Junio C Hamano | 2016-10-03 | 1 | -1/+1 | |
* | | | | | | Merge branch 'va/i18n' | Junio C Hamano | 2016-10-26 | 1 | -7/+7 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | i18n: diff: mark warnings for translationva/i18n | Vasco Almeida | 2016-10-17 | 1 | -7/+7 | |
* | | | | | | | Merge branch 'jc/ws-error-highlight' | Junio C Hamano | 2016-10-26 | 1 | -34/+55 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | diff: introduce diff.wsErrorHighlight optionjc/ws-error-highlight | Junio C Hamano | 2016-10-04 | 1 | -1/+10 | |
| * | | | | | | | diff.c: move ws-error-highlight parsing helpers up | Junio C Hamano | 2016-10-04 | 1 | -37/+37 | |
| * | | | | | | | diff.c: refactor parse_ws_error_highlight() | Junio C Hamano | 2016-10-04 | 1 | -5/+16 | |
* | | | | | | | | Merge branch 'jc/diff-unique-abbrev-comments' | Junio C Hamano | 2016-10-26 | 1 | -1/+22 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | diff_unique_abbrev(): document its assumption and limitationjc/diff-unique-abbrev-comments | Junio C Hamano | 2016-09-30 | 1 | -1/+22 | |
| * | | | | | | | Merge branch 'js/regexec-buf' into maint | Junio C Hamano | 2016-09-29 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ | Merge branch 'rs/qsort' | Junio C Hamano | 2016-10-10 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | use QSORT | René Scharfe | 2016-09-29 | 1 | -3/+3 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-10-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | use strbuf_add_unique_abbrev() for adding short hashes, part 2 | René Scharfe | 2016-09-27 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch 'js/regexec-buf' | Junio C Hamano | 2016-09-26 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | regex: use regexec_buf() | Johannes Schindelin | 2016-09-21 | 1 | -1/+2 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'va/i18n-more' | Junio C Hamano | 2016-09-26 | 1 | -5/+10 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | i18n: i18n: diff: mark die messages for translation | Jean-Noël AVILA | 2016-09-21 | 1 | -5/+10 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'mh/diff-indent-heuristic' | Junio C Hamano | 2016-09-26 | 1 | -7/+29 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | blame: honor the diff heuristic options and config | Michael Haggerty | 2016-09-19 | 1 | -12/+17 | |
| * | | | | | | | diff: improve positioning of add/delete blocks in diffs | Michael Haggerty | 2016-09-19 | 1 | -3/+20 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2016-09-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | cache: convert struct cache_entry to use struct object_id | brian m. carlson | 2016-09-07 | 1 | -1/+1 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'sb/diff-cleanup' | Junio C Hamano | 2016-09-15 | 1 | -21/+10 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | diff: remove dead codesb/diff-cleanup | Stefan Beller | 2016-09-08 | 1 | -8/+0 | |
| * | | | | | | diff: omit found pointer from emit_callback | Stefan Beller | 2016-09-08 | 1 | -4/+2 | |
| * | | | | | | diff.c: use diff_options directly | Stefan Beller | 2016-09-08 | 1 | -11/+10 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'jk/diff-submodule-diff-inline' | Junio C Hamano | 2016-09-12 | 1 | -17/+37 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | diff: teach diff to display submodule difference with an inline diff | Jacob Keller | 2016-08-31 | 1 | -9/+22 | |
| * | | | | | submodule: convert show_submodule_summary to use struct object_id * | Jacob Keller | 2016-08-31 | 1 | -1/+1 | |
| * | | | | | diff: prepare for additional submodule formats | Jacob Keller | 2016-08-31 | 1 | -6/+6 | |
| * | | | | | graph: add support for --line-prefix on all graph-aware output | Jacob Keller | 2016-08-31 | 1 | -0/+7 | |
| * | | | | | diff.c: remove output_prefix_length field | Junio C Hamano | 2016-08-31 | 1 | -1/+1 | |
* | | | | | | Merge branch 'kw/patch-ids-optim' | Junio C Hamano | 2016-08-12 | 1 | -6/+10 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | patch-ids: add flag to create the diff patch id using header only data | Kevin Willford | 2016-07-29 | 1 | -6/+10 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' | Junio C Hamano | 2016-08-03 | 1 | -0/+7 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | diff: do not reuse worktree files that need "clean" conversionjk/diff-do-not-reuse-wtf-needs-cleaning | Jeff King | 2016-07-22 | 1 | -0/+7 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'bc/cocci' | Junio C Hamano | 2016-07-19 | 1 | -46/+53 | |
|\ \ \ \ | ||||||
| * | | | | diff: convert prep_temp_blob() to struct object_idbc/cocci | brian m. carlson | 2016-06-28 | 1 | -4/+4 | |
| * | | | | diff: rename struct diff_filespec's sha1_valid member | brian m. carlson | 2016-06-28 | 1 | -14/+14 | |
| * | | | | diff: convert struct diff_filespec to struct object_id | brian m. carlson | 2016-06-28 | 1 | -31/+38 | |
| * | | | | coccinelle: convert hashcpy() with null_sha1 to hashclr() | brian m. carlson | 2016-06-28 | 1 | -1/+1 | |
| | |/ / | |/| | | ||||||
* | | | | diff: do not color output when --color=auto and --output=<file> is given | Johannes Schindelin | 2016-06-28 | 1 | -0/+2 | |
|/ / / | ||||||
* | | | Merge branch 'jk/diff-compact-heuristic' | Junio C Hamano | 2016-06-10 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | diff: disable compaction heuristic for nowjk/diff-compact-heuristic | Junio C Hamano | 2016-06-10 | 1 | -1/+1 | |
* | | | | Merge branch 'jk/diff-compact-heuristic' | Junio C Hamano | 2016-05-06 | 1 | -0/+11 | |
|\ \ \ \ | |/ / / |