path: root/combine-diff.c
AgeCommit message (Expand)Author
2016-06-02pathspec: rename free_pathspec() to clear_pathspec()Junio C Hamano
2016-05-09combine-diff.c: use error_errno()Nguyễn Thái Ngọc Duy
2016-02-22use st_add and st_mult for allocation size computationJeff King
2016-02-22convert trivial cases to FLEX_ARRAY macrosJeff King
2016-02-22use xmallocz to avoid size arithmeticJeff King
2016-02-22convert trivial cases to ALLOC_ARRAYJeff King
2015-11-20Remove get_object_hash.brian m. carlson
2015-11-20Add several uses of get_object_hash.brian m. carlson
2015-09-28Sync with 2.4.10Junio C Hamano
2015-09-28Sync with 2.3.10Junio C Hamano
2015-09-28react to errors in xdi_diffJeff King
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano
2015-05-27diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTJeff King
2015-03-14diff: convert struct combine_diff_path to object_idbrian m. carlson
2014-09-02Merge branch 'jk/pretty-empty-format'Junio C Hamano
2014-08-26Merge branch 'jk/diff-tree-t-fix'Junio C Hamano
2014-08-20intersect_paths: respect mode in git's tree-sortJeff King
2014-07-30pretty: make empty userformats truly emptyJeff King
2014-06-06Merge branch 'mk/show-s-no-extra-blank-line-for-merges'Junio C Hamano
2014-05-15git-show: fix 'git show -s' to not add extra terminator after merge commitMax Kirillov
2014-04-07combine-diff: speed it up, by using multiparent diff tree-walker directlyKirill Smelkov
2014-02-24combine-diff: move changed-paths scanning logic into its own functionKirill Smelkov
2014-02-24combine-diff: move show_log_first logic/action out of paths scanningKirill Smelkov
2014-02-24combine-diff: simplify intersect_paths() furtherJunio C Hamano
2014-02-24combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov
2014-02-24combine-diff: optimize combine_diff_path sets intersectionKirill Smelkov
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano
2013-09-09Merge branch 'tr/log-full-diff-keep-true-parents'Junio C Hamano
2013-08-01log: use true parents for diff even when rewritingThomas Rast
2013-07-29many small typofixesOndřej Bílka
2013-07-15remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy
2013-06-11Merge branch 'cb/log-follow-with-combined'Junio C Hamano
2013-06-02Merge branch 'mk/combine-diff-context-horizon-fix'Junio C Hamano
2013-05-28fix segfault with git log -c --followClemens Buchacher
2013-05-15combine-diff.c: Fix output when changes are exactly 3 lines apartMatthijs Kooijman
2013-03-25combine-diff: coalesce lost lines optimallyAntoine Pelisse
2013-03-14Allow combined diff to ignore white-spacesAntoine Pelisse
2013-02-14Merge branch 'jk/diff-graph-cleanup'Junio C Hamano
2013-02-12combine-diff.c: teach combined diffs about line prefixJohn Keeping
2013-02-03combine-diff: lift 32-way limit of combined diffJunio C Hamano
2012-09-10Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano
2012-08-27Merge branch 'jk/maint-null-in-trees'Junio C Hamano
2012-07-29diff: do not use null sha1 as a sentinel valueJeff King
2012-04-16Merge branch 'rs/combine-diff-zero-context-at-the-beginning'Junio C Hamano
2012-03-26combine-diff: fix loop index underflowRené Scharfe
2011-12-18pass struct commit to diff_tree_combined_merge()René Scharfe
2011-12-18use struct sha1_array in diff_tree_combined()René Scharfe
2011-08-29Merge branch 'jk/color-and-pager'Junio C Hamano
2011-08-29Merge branch 'jc/combine-diff-callback'Junio C Hamano
2011-08-21combine-diff: support format_callbackJunio C Hamano