summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
2017-05-01fix minor typosRené Genz-1/+1
2017-04-19Merge branch 'bc/object-id'Junio C Hamano-2/+2
2017-03-30diff: avoid fixed-size buffer for patch-idsJeff King-31/+37
2017-03-26Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZbrian m. carlson-2/+2
2017-03-21prefix_filename: return newly allocated stringJeff King-3/+3
2017-03-21prefix_filename: drop length parameterJeff King-2/+2
2017-03-12Merge branch 'jc/diff-populate-filespec-size-only-fix'Junio C Hamano-1/+18
2017-03-02diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()Junio C Hamano-1/+18
2017-02-15Merge branch 'rs/swap'Junio C Hamano-8/+4
2017-02-10Merge branch 'jk/log-graph-name-only'Junio C Hamano-0/+1
2017-02-08diff: print line prefix for --name-only outputJeff King-0/+1
2017-01-30use oid_to_hex_r() for converting struct object_id hashes to hex stringsRené Scharfe-1/+1
2017-01-30diff: use SWAP macroRené Scharfe-3/+1
2017-01-30use SWAP macroRené Scharfe-5/+3
2017-01-12diff: add interhunk context config optionVegard Nossum-0/+8
2017-01-10Merge branch 'jc/retire-compaction-heuristics'Junio C Hamano-20/+3
2016-12-23diff: retire "compaction" heuristicsJunio C Hamano-20/+3
2016-12-08diff: handle --no-abbrev in no-index caseJack Bates-1/+5
2016-11-17Merge branch 'tk/diffcore-delta-remove-unused'Junio C Hamano-1/+1
2016-11-14diffcore-delta: remove unused parameter to diffcore_count_changes()Tobias Klauser-1/+1
2016-10-27Merge branch 'nd/ita-empty-commit'Junio C Hamano-0/+4
2016-10-27Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano-16/+29
2016-10-27Merge branch 'lt/abbrev-auto'Junio C Hamano-1/+1
2016-10-26diff: handle sha1 abbreviations outside of repositoryJeff King-4/+17
2016-10-26diff_aligned_abbrev: use "struct oid"Jeff King-9/+11
2016-10-26diff_unique_abbrev: rename to diff_aligned_abbrevJeff King-7/+3
2016-10-26Merge branch 'va/i18n'Junio C Hamano-7/+7
2016-10-26Merge branch 'jc/ws-error-highlight'Junio C Hamano-34/+55
2016-10-26Merge branch 'jc/diff-unique-abbrev-comments'Junio C Hamano-1/+22
2016-10-24diff: add --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy-0/+4
2016-10-17i18n: diff: mark warnings for translationVasco Almeida-7/+7
2016-10-10Merge branch 'rs/qsort'Junio C Hamano-3/+3
2016-10-06Merge branch 'rs/cocci'Junio C Hamano-1/+1
2016-10-04diff: introduce diff.wsErrorHighlight optionJunio C Hamano-1/+10
2016-10-04diff.c: move ws-error-highlight parsing helpers upJunio C Hamano-37/+37
2016-10-04diff.c: refactor parse_ws_error_highlight()Junio C Hamano-5/+16
2016-10-03abbrev: prepare for new world orderJunio C Hamano-1/+1
2016-09-30diff_unique_abbrev(): document its assumption and limitationJunio C Hamano-1/+22
2016-09-29Merge branch 'js/regexec-buf' into maintJunio C Hamano-1/+2
2016-09-29use QSORTRené Scharfe-3/+3
2016-09-27use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe-1/+1
2016-09-26Merge branch 'js/regexec-buf'Junio C Hamano-1/+2
2016-09-26Merge branch 'va/i18n-more'Junio C Hamano-5/+10
2016-09-26Merge branch 'mh/diff-indent-heuristic'Junio C Hamano-7/+29
2016-09-21regex: use regexec_buf()Johannes Schindelin-1/+2
2016-09-21i18n: i18n: diff: mark die messages for translationJean-Noël AVILA-5/+10
2016-09-19Merge branch 'bc/object-id'Junio C Hamano-1/+1
2016-09-19blame: honor the diff heuristic options and configMichael Haggerty-12/+17
2016-09-19diff: improve positioning of add/delete blocks in diffsMichael Haggerty-3/+20
2016-09-15Merge branch 'sb/diff-cleanup'Junio C Hamano-21/+10