summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2017-07-12Merge branch 'rs/use-div-round-up'Junio C Hamano
2017-07-10use DIV_ROUND_UPRené Scharfe
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano
2017-06-24Merge branch 'bw/config-h'Junio C Hamano
2017-06-24Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano
2017-06-19Merge branch 'bw/object-id'Junio C Hamano
2017-06-16coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-06-13Merge branch 'nd/fopen-errors'Junio C Hamano
2017-06-13convert: convert convert_to_git to take an indexBrandon Williams
2017-06-05diff: rename diff_fill_sha1_info to diff_fill_oid_infoBrandon Williams
2017-06-05Merge branch 'js/blame-lib'Junio C Hamano
2017-06-05Merge branch 'mb/diff-default-to-indent-heuristics'Junio C Hamano
2017-06-02diff: convert diff_flush_patch_id to struct object_idBrandon Williams
2017-06-02diff: finish conversion for prepare_temp_file to struct object_idBrandon Williams
2017-06-02diff: convert reuse_worktree_file to struct object_idBrandon Williams
2017-06-02diff: convert fill_filespec to struct object_idBrandon Williams
2017-06-02diff: convert diff_change to struct object_idBrandon Williams
2017-06-02diff: convert diff_addremove to struct object_idBrandon Williams
2017-05-29Merge branch 'bc/object-id'Junio C Hamano
2017-05-26use xfopen() in more placesNguyễn Thái Ngọc Duy
2017-05-24blame: move textconv_object with related functionsJeff Smith
2017-05-09diff: enable indent heuristic by defaultStefan Beller
2017-05-09diff: make the indent heuristic part of diff's basic configurationMarc Branchaud
2017-05-08notes-cache: convert to struct object_idbrian m. carlson
2017-05-01fix minor typosRené Genz
2017-04-20Merge branch 'bc/object-id'Junio C Hamano
2017-03-30diff: avoid fixed-size buffer for patch-idsJeff King
2017-03-27Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZbrian m. carlson
2017-03-21prefix_filename: return newly allocated stringJeff King
2017-03-21prefix_filename: drop length parameterJeff King
2017-03-13Merge branch 'jc/diff-populate-filespec-size-only-fix'Junio C Hamano
2017-03-02diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()Junio C Hamano
2017-02-15Merge branch 'rs/swap'Junio C Hamano
2017-02-10Merge branch 'jk/log-graph-name-only'Junio C Hamano
2017-02-08diff: print line prefix for --name-only outputJeff King
2017-01-30use oid_to_hex_r() for converting struct object_id hashes to hex stringsRené Scharfe
2017-01-30diff: use SWAP macroRené Scharfe
2017-01-30use SWAP macroRené Scharfe
2017-01-12diff: add interhunk context config optionVegard Nossum
2017-01-10Merge branch 'jc/retire-compaction-heuristics'Junio C Hamano
2016-12-23diff: retire "compaction" heuristicsJunio C Hamano
2016-12-08diff: handle --no-abbrev in no-index caseJack Bates
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