summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2017-06-05Merge branch 'js/blame-lib'Junio C Hamano1-0/+23
2017-06-05Merge branch 'mb/diff-default-to-indent-heuristics'Junio C Hamano1-4/+4
2017-06-02diff: convert diff_flush_patch_id to struct object_idBrandon Williams1-6/+6
2017-06-02diff: finish conversion for prepare_temp_file to struct object_idBrandon Williams1-2/+2
2017-06-02diff: convert reuse_worktree_file to struct object_idBrandon Williams1-5/+5
2017-06-02diff: convert fill_filespec to struct object_idBrandon Williams1-8/+8
2017-06-02diff: convert diff_change to struct object_idBrandon Williams1-7/+7
2017-06-02diff: convert diff_addremove to struct object_idBrandon Williams1-4/+4
2017-05-29Merge branch 'bc/object-id'Junio C Hamano1-2/+2
2017-05-26use xfopen() in more placesNguyễn Thái Ngọc Duy1-6/+2
2017-05-24blame: move textconv_object with related functionsJeff Smith1-0/+23
2017-05-09diff: enable indent heuristic by defaultStefan Beller1-1/+1
2017-05-09diff: make the indent heuristic part of diff's basic configurationMarc Branchaud1-3/+3
2017-05-08notes-cache: convert to struct object_idbrian m. carlson1-2/+2
2017-05-01fix minor typosRené Genz1-1/+1
2017-04-19Merge branch 'bc/object-id'Junio C Hamano1-2/+2
2017-03-30diff: avoid fixed-size buffer for patch-idsJeff King1-31/+37
2017-03-26Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZbrian m. carlson1-2/+2
2017-03-21prefix_filename: return newly allocated stringJeff King1-3/+3
2017-03-21prefix_filename: drop length parameterJeff King1-2/+2
2017-03-12Merge branch 'jc/diff-populate-filespec-size-only-fix'Junio C Hamano1-1/+18
2017-03-02diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()Junio C Hamano1-1/+18
2017-02-15Merge branch 'rs/swap'Junio C Hamano1-8/+4
2017-02-10Merge branch 'jk/log-graph-name-only'Junio C Hamano1-0/+1
2017-02-08diff: print line prefix for --name-only outputJeff King1-0/+1
2017-01-30use oid_to_hex_r() for converting struct object_id hashes to hex stringsRené Scharfe1-1/+1
2017-01-30diff: use SWAP macroRené Scharfe1-3/+1
2017-01-30use SWAP macroRené Scharfe1-5/+3
2017-01-12diff: add interhunk context config optionVegard Nossum1-0/+8
2017-01-10Merge branch 'jc/retire-compaction-heuristics'Junio C Hamano1-20/+3
2016-12-23diff: retire "compaction" heuristicsJunio C Hamano1-20/+3
2016-12-08diff: handle --no-abbrev in no-index caseJack Bates1-1/+5
2016-11-29Merge branch 'tk/diffcore-delta-remove-unused' into maintJunio C Hamano1-1/+1
2016-11-17Merge branch 'tk/diffcore-delta-remove-unused'Junio C Hamano1-1/+1
2016-11-14diffcore-delta: remove unused parameter to diffcore_count_changes()Tobias Klauser1-1/+1
2016-10-28Merge branch 'rs/cocci' into maintJunio C Hamano1-1/+1
2016-10-27Merge branch 'nd/ita-empty-commit'Junio C Hamano1-0/+4
2016-10-27Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano1-16/+29
2016-10-27Merge branch 'lt/abbrev-auto'Junio C Hamano1-1/+1
2016-10-26diff: handle sha1 abbreviations outside of repositoryJeff King1-4/+17
2016-10-26diff_aligned_abbrev: use "struct oid"Jeff King1-9/+11
2016-10-26diff_unique_abbrev: rename to diff_aligned_abbrevJeff King1-7/+3
2016-10-26Merge branch 'va/i18n'Junio C Hamano1-7/+7
2016-10-26Merge branch 'jc/ws-error-highlight'Junio C Hamano1-34/+55
2016-10-26Merge branch 'jc/diff-unique-abbrev-comments'Junio C Hamano1-1/+22
2016-10-24diff: add --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy1-0/+4
2016-10-17i18n: diff: mark warnings for translationVasco Almeida1-7/+7
2016-10-10Merge branch 'rs/qsort'Junio C Hamano1-3/+3
2016-10-06Merge branch 'rs/cocci'Junio C Hamano1-1/+1
2016-10-04diff: introduce diff.wsErrorHighlight optionJunio C Hamano1-1/+10