aboutsummaryrefslogtreecommitdiffstats
path: root/combine-diff.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2014-09-19Merge branch 'jk/pretty-empty-format' into maintJunio C Hamano1-1/+2
2014-08-26Merge branch 'jk/diff-tree-t-fix'Junio C Hamano1-1/+11
2014-08-20intersect_paths: respect mode in git's tree-sortJeff King1-1/+11
2014-07-30pretty: make empty userformats truly emptyJeff King1-1/+2
2014-06-06Merge branch 'mk/show-s-no-extra-blank-line-for-merges'Junio C Hamano1-1/+2
2014-05-15git-show: fix 'git show -s' to not add extra terminator after merge commitMax Kirillov1-1/+2
2014-04-07combine-diff: speed it up, by using multiparent diff tree-walker directlyKirill Smelkov1-5/+83
2014-02-24combine-diff: move changed-paths scanning logic into its own functionKirill Smelkov1-27/+53
2014-02-24combine-diff: move show_log_first logic/action out of paths scanningKirill Smelkov1-10/+14
2014-02-24combine-diff: simplify intersect_paths() furtherJunio C Hamano1-22/+12
2014-02-24combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov1-21/+9
2014-02-24combine-diff: optimize combine_diff_path sets intersectionKirill Smelkov1-21/+73
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano1-2/+2
2013-09-09Merge branch 'tr/log-full-diff-keep-true-parents'Junio C Hamano1-1/+2
2013-08-01log: use true parents for diff even when rewritingThomas Rast1-1/+2
2013-07-29many small typofixesOndřej Bílka1-1/+1
2013-07-15remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy1-2/+2
2013-06-11Merge branch 'cb/log-follow-with-combined'Junio C Hamano1-0/+3
2013-06-02Merge branch 'mk/combine-diff-context-horizon-fix'Junio C Hamano1-2/+5
2013-05-28fix segfault with git log -c --followClemens Buchacher1-0/+3
2013-05-15combine-diff.c: Fix output when changes are exactly 3 lines apartMatthijs Kooijman1-2/+5
2013-03-25combine-diff: coalesce lost lines optimallyAntoine Pelisse1-64/+191
2013-03-14Allow combined diff to ignore white-spacesAntoine Pelisse1-7/+50
2013-02-14Merge branch 'jk/diff-graph-cleanup'Junio C Hamano1-17/+32
2013-02-12combine-diff.c: teach combined diffs about line prefixJohn Keeping1-17/+30
2013-02-03combine-diff: lift 32-way limit of combined diffJunio C Hamano1-14/+7
2012-09-10Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano1-2/+2
2012-08-27Merge branch 'jk/maint-null-in-trees'Junio C Hamano1-2/+2
2012-07-29diff: do not use null sha1 as a sentinel valueJeff King1-2/+2
2012-04-16Merge branch 'rs/combine-diff-zero-context-at-the-beginning'Junio C Hamano1-1/+1
2012-03-25combine-diff: fix loop index underflowRené Scharfe1-1/+1
2011-12-17pass struct commit to diff_tree_combined_merge()René Scharfe1-4/+3
2011-12-17use struct sha1_array in diff_tree_combined()René Scharfe1-21/+13
2011-08-28Merge branch 'jk/color-and-pager'Junio C Hamano1-4/+3
2011-08-28Merge branch 'jc/combine-diff-callback'Junio C Hamano1-0/+69
2011-08-20combine-diff: support format_callbackJunio C Hamano1-0/+69
2011-08-18diff: refactor COLOR_DIFF from a flag into an intJeff King1-4/+3
2011-08-17Merge branch 'jc/maint-combined-diff-work-tree'Junio C Hamano1-4/+10
2011-08-04diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"Junio C Hamano1-4/+10
2011-05-24combine-diff: respect textconv attributesJeff King1-9/+32
2011-05-23combine-diff: handle binary files as binaryJeff King1-2/+35
2011-05-23combine-diff: calculate mode_differs earlierJeff King1-2/+7
2011-05-23combine-diff: split header printing into its own functionJeff King1-61/+74
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano1-1/+1
2010-06-13Merge branch 'rs/diff-no-minimal'Junio C Hamano1-1/+1
2010-05-04remove ecb parameter from xdi_diff_outf()René Scharfe1-2/+1
2010-05-02git diff too slow for a fileRené Scharfe1-1/+1
2010-04-17combined diff: correctly handle truncated fileThomas Rast1-6/+8
2009-11-28Give the hunk comment its own colorBert Wesarg1-1/+4
2009-07-22Merge branch 'maint'Junio C Hamano1-15/+14
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-09 17:17:07 +0000