summaryrefslogtreecommitdiff
path: root/combine-diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/diff-cc-stat-fixes'Junio C Hamano2019-02-051-6/+11
|\
| * combine-diff: treat --dirstat like --statJeff King2019-01-241-0/+1
| * combine-diff: treat --summary like --statJeff King2019-01-241-0/+1
| * combine-diff: treat --shortstat like --statJeff King2019-01-241-0/+1
| * combine-diff: factor out stat-format maskJeff King2019-01-241-6/+8
* | Merge branch 'nd/the-index'Junio C Hamano2019-01-041-1/+1
|\ \ | |/ |/|
| * notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-1/+1
* | Merge branch 'jk/xdiff-interface'Junio C Hamano2018-11-131-31/+36
|\ \ | |/ |/|
| * combine-diff: use an xdiff hunk callbackJeff King2018-11-051-31/+36
| * xdiff-interface: provide a separate consume callback for hunksJeff King2018-11-021-2/+2
* | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-13/+19
|\ \
| * | userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
| * | diff.c: remove the_index dependency in textconv() functionsNguyễn Thái Ngọc Duy2018-09-211-11/+16
| * | combine-diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+2
| |/
* | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-2/+2
|/
* object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-1/+1
* Convert find_unique_abbrev* to struct object_idbrian m. carlson2018-03-141-2/+2
* Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-061-6/+6
|\
| * combine-diff: rename 'new' variablesBrandon Williams2018-02-221-6/+6
* | Merge branch 'tb/crlf-conv-flags'Junio C Hamano2018-02-131-1/+1
|\ \ | |/ |/|
| * convert_to_git(): safe_crlf/checksafe becomes int conv_flagstb/crlf-conv-flagsTorsten Bögershausen2018-01-161-1/+1
* | diff: introduce DIFF_PICKAXE_KINDS_MASKStefan Beller2018-01-041-1/+1
|/
* Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-5/+5
|\
| * diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-011-5/+5
| * diff: remove DIFF_OPT_CLR macroBrandon Williams2017-11-011-1/+1
| * diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-1/+1
| * diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-011-3/+3
* | refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson2017-10-161-1/+1
|/
* Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano2017-06-241-1/+1
|\
| * convert: convert convert_to_git to take an indexBrandon Williams2017-06-131-1/+1
* | tree-diff: convert diff_tree_paths to struct object_idBrandon Williams2017-06-051-5/+5
* | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-051-2/+2
* | combine-diff: convert find_paths_* to struct object_idBrandon Williams2017-06-021-6/+6
* | combine-diff: convert diff_tree_combined to struct object_idBrandon Williams2017-06-021-5/+5
* | diff: convert fill_filespec to struct object_idBrandon Williams2017-06-021-2/+2
|/
* Merge branch 'bc/object-id'Junio C Hamano2017-04-191-9/+9
|\
| * Rename sha1_array to oid_arraybrian m. carlson2017-03-311-6/+6
| * Make sha1_array_append take a struct object_id *brian m. carlson2017-03-311-1/+1
| * sha1-array: convert internal storage for struct sha1_array to object_idbrian m. carlson2017-03-281-3/+3
* | combine-diff: replace malloc/snprintf with xstrfmtJeff King2017-03-301-3/+4
|/
* diff_aligned_abbrev: use "struct oid"Jeff King2016-10-261-2/+2
* diff_unique_abbrev: rename to diff_aligned_abbrevJeff King2016-10-261-3/+3
* Merge branch 'bc/cocci'Junio C Hamano2016-07-191-7/+7
|\
| * diff: rename struct diff_filespec's sha1_valid memberbrian m. carlson2016-06-281-2/+2
| * diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-281-5/+5
* | pathspec: rename free_pathspec() to clear_pathspec()jc/clear-pathspecJunio C Hamano2016-06-021-1/+1
|/
* combine-diff.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-2/+1
* use st_add and st_mult for allocation size computationJeff King2016-02-221-7/+7
* convert trivial cases to FLEX_ARRAY macrosJeff King2016-02-221-3/+1
View Lorry Controller Status