summaryrefslogtreecommitdiff
path: root/combine-diff.c
AgeCommit message (Expand)Author
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
2011-08-18diff: refactor COLOR_DIFF from a flag into an intJeff King
2011-08-18Merge branch 'jc/maint-combined-diff-work-tree'Junio C Hamano
2011-08-04diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"Junio C Hamano
2011-05-24combine-diff: respect textconv attributesJeff King
2011-05-23combine-diff: handle binary files as binaryJeff King
2011-05-23combine-diff: calculate mode_differs earlierJeff King
2011-05-23combine-diff: split header printing into its own functionJeff King
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano
2010-06-13Merge branch 'rs/diff-no-minimal'Junio C Hamano
2010-05-04remove ecb parameter from xdi_diff_outf()René Scharfe
2010-05-02git diff too slow for a fileRené Scharfe
2010-04-17combined diff: correctly handle truncated fileThomas Rast
2009-11-28Give the hunk comment its own colorBert Wesarg
2009-07-23Merge branch 'maint'Junio C Hamano
2009-07-22diff --cc: a lost line at the beginning of the file is shown incorrectlyJunio C Hamano
2009-07-22combine-diff.c: fix performance problem when folding common deleted linesJunio C Hamano
2009-06-27Use die_errno() instead of die() when checking syscallsThomas Rast
2009-05-01Fix a bunch of pointer declarations (codestyle)Felipe Contreras
2009-04-29Merge branch 'maint'Junio C Hamano
2009-04-29Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano
2009-04-29diff -c -p: do not die on submodulesJunio C Hamano
2009-03-18Merge branch 'kb/checkout-optim'Junio C Hamano
2009-03-08Move local variables to narrower scopesBenjamin Kramer
2009-02-10show_patch_diff(): remove a call to fstat()Kjetil Barvik
2008-12-17combine-diff.c: use strbuf_readlink()Junio C Hamano
2008-10-25Always initialize xpparam_t to 0Brian Downing