summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2017-06-24Merge branch 'bw/ls-files-sans-the-index'Libravatar Junio C Hamano1-3/+3
2017-06-19Merge branch 'bw/object-id'Libravatar Junio C Hamano1-38/+38
2017-06-16coccinelle: make use of the "type" FREE_AND_NULL() ruleLibravatar Ævar Arnfjörð Bjarmason1-4/+2
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-06-13Merge branch 'nd/fopen-errors'Libravatar Junio C Hamano1-6/+2
2017-06-13convert: convert convert_to_git to take an indexLibravatar Brandon Williams1-3/+3
2017-06-05diff: rename diff_fill_sha1_info to diff_fill_oid_infoLibravatar Brandon Williams1-9/+9
2017-06-05Merge branch 'js/blame-lib'Libravatar Junio C Hamano1-0/+23
2017-06-05Merge branch 'mb/diff-default-to-indent-heuristics'Libravatar Junio C Hamano1-4/+4
2017-06-02diff: convert diff_flush_patch_id to struct object_idLibravatar Brandon Williams1-6/+6
2017-06-02diff: finish conversion for prepare_temp_file to struct object_idLibravatar Brandon Williams1-2/+2
2017-06-02diff: convert reuse_worktree_file to struct object_idLibravatar Brandon Williams1-5/+5
2017-06-02diff: convert fill_filespec to struct object_idLibravatar Brandon Williams1-8/+8
2017-06-02diff: convert diff_change to struct object_idLibravatar Brandon Williams1-7/+7
2017-06-02diff: convert diff_addremove to struct object_idLibravatar Brandon Williams1-4/+4
2017-05-29Merge branch 'bc/object-id'Libravatar Junio C Hamano1-2/+2
2017-05-26use xfopen() in more placesLibravatar Nguyễn Thái Ngọc Duy1-6/+2
2017-05-24blame: move textconv_object with related functionsLibravatar Jeff Smith1-0/+23
2017-05-09diff: enable indent heuristic by defaultLibravatar Stefan Beller1-1/+1
2017-05-09diff: make the indent heuristic part of diff's basic configurationLibravatar Marc Branchaud1-3/+3
2017-05-08notes-cache: convert to struct object_idLibravatar brian m. carlson1-2/+2
2017-05-01fix minor typosLibravatar René Genz1-1/+1
2017-04-19Merge branch 'bc/object-id'Libravatar Junio C Hamano1-2/+2
2017-03-30diff: avoid fixed-size buffer for patch-idsLibravatar Jeff King1-31/+37
2017-03-26Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZLibravatar brian m. carlson1-2/+2
2017-03-21prefix_filename: return newly allocated stringLibravatar Jeff King1-3/+3
2017-03-21prefix_filename: drop length parameterLibravatar Jeff King1-2/+2
2017-03-12Merge branch 'jc/diff-populate-filespec-size-only-fix'Libravatar Junio C Hamano1-1/+18
2017-03-02diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()Libravatar Junio C Hamano1-1/+18
2017-02-15Merge branch 'rs/swap'Libravatar Junio C Hamano1-8/+4
2017-02-10Merge branch 'jk/log-graph-name-only'Libravatar Junio C Hamano1-0/+1
2017-02-08diff: print line prefix for --name-only outputLibravatar Jeff King1-0/+1
2017-01-30use oid_to_hex_r() for converting struct object_id hashes to hex stringsLibravatar René Scharfe1-1/+1
2017-01-30diff: use SWAP macroLibravatar René Scharfe1-3/+1
2017-01-30use SWAP macroLibravatar René Scharfe1-5/+3
2017-01-12diff: add interhunk context config optionLibravatar Vegard Nossum1-0/+8
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