summaryrefslogtreecommitdiff
path: root/combine-diff.c
AgeCommit message (Expand)AuthorFilesLines
2017-06-05diff-tree: convert diff_tree_sha1 to struct object_idLibravatar Brandon Williams1-2/+2
2017-06-02combine-diff: convert find_paths_* to struct object_idLibravatar Brandon Williams1-6/+6
2017-06-02combine-diff: convert diff_tree_combined to struct object_idLibravatar Brandon Williams1-5/+5
2017-06-02diff: convert fill_filespec to struct object_idLibravatar Brandon Williams1-2/+2
2017-04-19Merge branch 'bc/object-id'Libravatar Junio C Hamano1-9/+9
2017-03-31Rename sha1_array to oid_arrayLibravatar brian m. carlson1-6/+6
2017-03-31Make sha1_array_append take a struct object_id *Libravatar brian m. carlson1-1/+1
2017-03-30combine-diff: replace malloc/snprintf with xstrfmtLibravatar Jeff King1-3/+4
2017-03-28sha1-array: convert internal storage for struct sha1_array to object_idLibravatar brian m. carlson1-3/+3
2016-10-26diff_aligned_abbrev: use "struct oid"Libravatar Jeff King1-2/+2
2016-10-26diff_unique_abbrev: rename to diff_aligned_abbrevLibravatar Jeff King1-3/+3
2016-07-19Merge branch 'bc/cocci'Libravatar Junio C Hamano1-7/+7
2016-06-28diff: rename struct diff_filespec's sha1_valid memberLibravatar brian m. carlson1-2/+2
2016-06-28diff: convert struct diff_filespec to struct object_idLibravatar brian m. carlson1-5/+5
2016-06-02pathspec: rename free_pathspec() to clear_pathspec()Libravatar Junio C Hamano1-1/+1
2016-05-09combine-diff.c: use error_errno()Libravatar Nguyễn Thái Ngọc Duy1-2/+1
2016-02-22use st_add and st_mult for allocation size computationLibravatar Jeff King1-7/+7
2016-02-22convert trivial cases to FLEX_ARRAY macrosLibravatar Jeff King1-3/+1
2016-02-22use xmallocz to avoid size arithmeticLibravatar Jeff King1-3/+1
2016-02-22convert trivial cases to ALLOC_ARRAYLibravatar Jeff King1-2/+2
2015-11-20Remove get_object_hash.Libravatar brian m. carlson1-2/+2
2015-11-20Add several uses of get_object_hash.Libravatar brian m. carlson1-2/+2
2015-09-28Sync with 2.4.10Libravatar Junio C Hamano1-2/+4
2015-09-28Sync with 2.3.10Libravatar Junio C Hamano1-2/+4
2015-09-28react to errors in xdi_diffLibravatar Jeff King1-2/+4
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Libravatar Junio C Hamano1-3/+3
2015-05-27diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTLibravatar Jeff King1-3/+3
2015-03-13diff: convert struct combine_diff_path to object_idLibravatar brian m. carlson1-28/+28
2014-09-02Merge branch 'jk/pretty-empty-format'Libravatar Junio C Hamano1-1/+2
2014-08-26Merge branch 'jk/diff-tree-t-fix'Libravatar Junio C Hamano1-1/+11
2014-08-20intersect_paths: respect mode in git's tree-sortLibravatar Jeff King1-1/+11
2014-07-30pretty: make empty userformats truly emptyLibravatar Jeff King1-1/+2
2014-06-06Merge branch 'mk/show-s-no-extra-blank-line-for-merges'Libravatar Junio C Hamano1-1/+2
2014-05-15git-show: fix 'git show -s' to not add extra terminator after merge commitLibravatar Max Kirillov1-1/+2
2014-04-07combine-diff: speed it up, by using multiparent diff tree-walker directlyLibravatar Kirill Smelkov1-5/+83
2014-02-24combine-diff: move changed-paths scanning logic into its own functionLibravatar Kirill Smelkov1-27/+53
2014-02-24combine-diff: move show_log_first logic/action out of paths scanningLibravatar Kirill Smelkov1-10/+14
2014-02-24combine-diff: simplify intersect_paths() furtherLibravatar Junio C Hamano1-22/+12
2014-02-24combine-diff: combine_diff_path.len is not needed anymoreLibravatar Kirill Smelkov1-21/+9
2014-02-24combine-diff: optimize combine_diff_path sets intersectionLibravatar Kirill Smelkov1-21/+73
2013-09-09Merge branch 'jl/submodule-mv'Libravatar Junio C Hamano1-2/+2
2013-09-09Merge branch 'tr/log-full-diff-keep-true-parents'Libravatar Junio C Hamano1-1/+2
2013-08-01log: use true parents for diff even when rewritingLibravatar Thomas Rast1-1/+2
2013-07-29many small typofixesLibravatar Ondřej Bílka1-1/+1
2013-07-15remove diff_tree_{setup,release}_pathsLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2013-06-11Merge branch 'cb/log-follow-with-combined'Libravatar Junio C Hamano1-0/+3
2013-06-02Merge branch 'mk/combine-diff-context-horizon-fix'Libravatar Junio C Hamano1-2/+5
2013-05-28fix segfault with git log -c --followLibravatar Clemens Buchacher1-0/+3
2013-05-15combine-diff.c: Fix output when changes are exactly 3 lines apartLibravatar Matthijs Kooijman1-2/+5
2013-03-25combine-diff: coalesce lost lines optimallyLibravatar Antoine Pelisse1-64/+191
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 08:26:27 +0000