summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2016-11-17Merge branch 'tk/diffcore-delta-remove-unused'Junio C Hamano
2016-11-14diffcore-delta: remove unused parameter to diffcore_count_changes()Tobias Klauser
2016-10-27Merge branch 'nd/ita-empty-commit'Junio C Hamano
2016-10-27Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano
2016-10-27Merge branch 'lt/abbrev-auto'Junio C Hamano
2016-10-26diff: handle sha1 abbreviations outside of repositoryJeff King
2016-10-26diff_aligned_abbrev: use "struct oid"Jeff King
2016-10-26diff_unique_abbrev: rename to diff_aligned_abbrevJeff King
2016-10-26Merge branch 'va/i18n'Junio C Hamano
2016-10-26Merge branch 'jc/ws-error-highlight'Junio C Hamano
2016-10-26Merge branch 'jc/diff-unique-abbrev-comments'Junio C Hamano
2016-10-24diff: add --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy
2016-10-17i18n: diff: mark warnings for translationVasco Almeida
2016-10-10Merge branch 'rs/qsort'Junio C Hamano
2016-10-06Merge branch 'rs/cocci'Junio C Hamano
2016-10-04diff: introduce diff.wsErrorHighlight optionJunio C Hamano
2016-10-04diff.c: move ws-error-highlight parsing helpers upJunio C Hamano
2016-10-04diff.c: refactor parse_ws_error_highlight()Junio C Hamano
2016-10-03abbrev: prepare for new world orderJunio C Hamano
2016-10-01diff_unique_abbrev(): document its assumption and limitationJunio C Hamano
2016-09-29Merge branch 'js/regexec-buf' into maintJunio C Hamano
2016-09-29use QSORTRené Scharfe
2016-09-27use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe
2016-09-26Merge branch 'js/regexec-buf'Junio C Hamano
2016-09-26Merge branch 'va/i18n-more'Junio C Hamano
2016-09-26Merge branch 'mh/diff-indent-heuristic'Junio C Hamano
2016-09-21regex: use regexec_buf()Johannes Schindelin
2016-09-21i18n: i18n: diff: mark die messages for translationJean-Noël AVILA
2016-09-19Merge branch 'bc/object-id'Junio C Hamano
2016-09-19blame: honor the diff heuristic options and configMichael Haggerty
2016-09-19diff: improve positioning of add/delete blocks in diffsMichael Haggerty
2016-09-15Merge branch 'sb/diff-cleanup'Junio C Hamano
2016-09-12Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano
2016-09-08diff: remove dead codeStefan Beller
2016-09-08diff: omit found pointer from emit_callbackStefan Beller
2016-09-08diff.c: use diff_options directlyStefan Beller
2016-09-07cache: convert struct cache_entry to use struct object_idbrian m. carlson
2016-09-01diff: teach diff to display submodule difference with an inline diffJacob Keller
2016-09-01submodule: convert show_submodule_summary to use struct object_id *Jacob Keller
2016-09-01diff: prepare for additional submodule formatsJacob Keller
2016-09-01graph: add support for --line-prefix on all graph-aware outputJacob Keller
2016-09-01diff.c: remove output_prefix_length fieldJunio C Hamano
2016-08-12Merge branch 'kw/patch-ids-optim'Junio C Hamano
2016-08-03Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'Junio C Hamano
2016-07-29patch-ids: add flag to create the diff patch id using header only dataKevin Willford
2016-07-22diff: do not reuse worktree files that need "clean" conversionJeff King
2016-07-19Merge branch 'bc/cocci'Junio C Hamano
2016-06-28diff: convert prep_temp_blob() to struct object_idbrian m. carlson
2016-06-28diff: rename struct diff_filespec's sha1_valid memberbrian m. carlson
2016-06-28diff: convert struct diff_filespec to struct object_idbrian m. carlson