summaryrefslogtreecommitdiff
path: root/combine-diff.c
AgeCommit message (Expand)AuthorFilesLines
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
2013-03-14Allow combined diff to ignore white-spacesLibravatar Antoine Pelisse1-7/+50
2013-02-14Merge branch 'jk/diff-graph-cleanup'Libravatar Junio C Hamano1-17/+32
2013-02-12combine-diff.c: teach combined diffs about line prefixLibravatar John Keeping1-17/+30
2013-02-03combine-diff: lift 32-way limit of combined diffLibravatar Junio C Hamano1-14/+7
2012-09-10Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Libravatar Junio C Hamano1-2/+2
2012-08-27Merge branch 'jk/maint-null-in-trees'Libravatar Junio C Hamano1-2/+2
2012-07-29diff: do not use null sha1 as a sentinel valueLibravatar Jeff King1-2/+2
2012-04-16Merge branch 'rs/combine-diff-zero-context-at-the-beginning'Libravatar Junio C Hamano1-1/+1
2012-03-25combine-diff: fix loop index underflowLibravatar René Scharfe1-1/+1
2011-12-17pass struct commit to diff_tree_combined_merge()Libravatar René Scharfe1-4/+3
2011-12-17use struct sha1_array in diff_tree_combined()Libravatar René Scharfe1-21/+13
2011-08-28Merge branch 'jk/color-and-pager'Libravatar Junio C Hamano1-4/+3
2011-08-28Merge branch 'jc/combine-diff-callback'Libravatar Junio C Hamano1-0/+69
2011-08-20combine-diff: support format_callbackLibravatar Junio C Hamano1-0/+69
2011-08-18diff: refactor COLOR_DIFF from a flag into an intLibravatar Jeff King1-4/+3
2011-08-17Merge branch 'jc/maint-combined-diff-work-tree'Libravatar Junio C Hamano1-4/+10
2011-08-04diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"Libravatar Junio C Hamano1-4/+10
2011-05-24combine-diff: respect textconv attributesLibravatar Jeff King1-9/+32
2011-05-23combine-diff: handle binary files as binaryLibravatar Jeff King1-2/+35
2011-05-23combine-diff: calculate mode_differs earlierLibravatar Jeff King1-2/+7
2011-05-23combine-diff: split header printing into its own functionLibravatar Jeff King1-61/+74
2010-06-21Merge branch 'rs/diff-no-minimal' into maintLibravatar Junio C Hamano1-1/+1
2010-06-13Merge branch 'rs/diff-no-minimal'Libravatar Junio C Hamano1-1/+1