summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2017-01-10Merge branch 'jc/retire-compaction-heuristics'Libravatar Junio C Hamano1-20/+3
2016-12-23diff: retire "compaction" heuristicsLibravatar Junio C Hamano1-20/+3
2016-12-08diff: handle --no-abbrev in no-index caseLibravatar Jack Bates1-1/+5
2016-11-17Merge branch 'tk/diffcore-delta-remove-unused'Libravatar Junio C Hamano1-1/+1
2016-11-14diffcore-delta: remove unused parameter to diffcore_count_changes()Libravatar Tobias Klauser1-1/+1
2016-10-27Merge branch 'nd/ita-empty-commit'Libravatar Junio C Hamano1-0/+4
2016-10-27Merge branch 'jk/no-looking-at-dotgit-outside-repo'Libravatar Junio C Hamano1-16/+29
2016-10-27Merge branch 'lt/abbrev-auto'Libravatar Junio C Hamano1-1/+1
2016-10-26diff: handle sha1 abbreviations outside of repositoryLibravatar Jeff King1-4/+17
2016-10-26diff_aligned_abbrev: use "struct oid"Libravatar Jeff King1-9/+11
2016-10-26diff_unique_abbrev: rename to diff_aligned_abbrevLibravatar Jeff King1-7/+3
2016-10-26Merge branch 'va/i18n'Libravatar Junio C Hamano1-7/+7
2016-10-26Merge branch 'jc/ws-error-highlight'Libravatar Junio C Hamano1-34/+55
2016-10-26Merge branch 'jc/diff-unique-abbrev-comments'Libravatar Junio C Hamano1-1/+22
2016-10-24diff: add --ita-[in]visible-in-indexLibravatar Nguyễn Thái Ngọc Duy1-0/+4
2016-10-17i18n: diff: mark warnings for translationLibravatar Vasco Almeida1-7/+7
2016-10-10Merge branch 'rs/qsort'Libravatar Junio C Hamano1-3/+3
2016-10-06Merge branch 'rs/cocci'Libravatar Junio C Hamano1-1/+1
2016-10-04diff: introduce diff.wsErrorHighlight optionLibravatar Junio C Hamano1-1/+10
2016-10-04diff.c: move ws-error-highlight parsing helpers upLibravatar Junio C Hamano1-37/+37
2016-10-04diff.c: refactor parse_ws_error_highlight()Libravatar Junio C Hamano1-5/+16
2016-10-03abbrev: prepare for new world orderLibravatar Junio C Hamano1-1/+1
2016-09-30diff_unique_abbrev(): document its assumption and limitationLibravatar Junio C Hamano1-1/+22
2016-09-29Merge branch 'js/regexec-buf' into maintLibravatar Junio C Hamano1-1/+2
2016-09-29use QSORTLibravatar René Scharfe1-3/+3
2016-09-27use strbuf_add_unique_abbrev() for adding short hashes, part 2Libravatar René Scharfe1-1/+1
2016-09-26Merge branch 'js/regexec-buf'Libravatar Junio C Hamano1-1/+2
2016-09-26Merge branch 'va/i18n-more'Libravatar Junio C Hamano1-5/+10
2016-09-26Merge branch 'mh/diff-indent-heuristic'Libravatar Junio C Hamano1-7/+29
2016-09-21regex: use regexec_buf()Libravatar Johannes Schindelin1-1/+2
2016-09-21i18n: i18n: diff: mark die messages for translationLibravatar Jean-Noël AVILA1-5/+10
2016-09-19Merge branch 'bc/object-id'Libravatar Junio C Hamano1-1/+1
2016-09-19blame: honor the diff heuristic options and configLibravatar Michael Haggerty1-12/+17
2016-09-19diff: improve positioning of add/delete blocks in diffsLibravatar Michael Haggerty1-3/+20
2016-09-15Merge branch 'sb/diff-cleanup'Libravatar Junio C Hamano1-21/+10
2016-09-12Merge branch 'jk/diff-submodule-diff-inline'Libravatar Junio C Hamano1-17/+37
2016-09-08diff: remove dead codeLibravatar Stefan Beller1-8/+0
2016-09-08diff: omit found pointer from emit_callbackLibravatar Stefan Beller1-4/+2
2016-09-08diff.c: use diff_options directlyLibravatar Stefan Beller1-11/+10
2016-09-07cache: convert struct cache_entry to use struct object_idLibravatar brian m. carlson1-1/+1
2016-08-31diff: teach diff to display submodule difference with an inline diffLibravatar Jacob Keller1-9/+22
2016-08-31submodule: convert show_submodule_summary to use struct object_id *Libravatar Jacob Keller1-1/+1
2016-08-31diff: prepare for additional submodule formatsLibravatar Jacob Keller1-6/+6
2016-08-31graph: add support for --line-prefix on all graph-aware outputLibravatar Jacob Keller1-0/+7
2016-08-31diff.c: remove output_prefix_length fieldLibravatar Junio C Hamano1-1/+1
2016-08-12Merge branch 'kw/patch-ids-optim'Libravatar Junio C Hamano1-6/+10
2016-08-03Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'Libravatar Junio C Hamano1-0/+7
2016-07-29patch-ids: add flag to create the diff patch id using header only dataLibravatar Kevin Willford1-6/+10
2016-07-22diff: do not reuse worktree files that need "clean" conversionLibravatar Jeff King1-0/+7
2016-07-19Merge branch 'bc/cocci'Libravatar Junio C Hamano1-46/+53