summaryrefslogtreecommitdiff
path: root/combine-diff.c
AgeCommit message (Expand)AuthorFilesLines
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
2010-05-04remove ecb parameter from xdi_diff_outf()Libravatar René Scharfe1-2/+1
2010-05-02git diff too slow for a fileLibravatar René Scharfe1-1/+1
2010-04-17combined diff: correctly handle truncated fileLibravatar Thomas Rast1-6/+8
2009-11-28Give the hunk comment its own colorLibravatar Bert Wesarg1-1/+4
2009-07-22Merge branch 'maint'Libravatar Junio C Hamano1-15/+14
2009-07-22diff --cc: a lost line at the beginning of the file is shown incorrectlyLibravatar Junio C Hamano1-7/+9
2009-07-22combine-diff.c: fix performance problem when folding common deleted linesLibravatar Junio C Hamano1-8/+5
2009-06-27Use die_errno() instead of die() when checking syscallsLibravatar Thomas Rast1-1/+1
2009-05-01Fix a bunch of pointer declarations (codestyle)Libravatar Felipe Contreras1-2/+2
2009-04-29Merge branch 'maint'Libravatar Junio C Hamano1-9/+25
2009-04-29Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-12/+26
2009-04-29diff -c -p: do not die on submodulesLibravatar Junio C Hamano1-12/+26
2009-03-17Merge branch 'kb/checkout-optim'Libravatar Junio C Hamano1-3/+1
2009-03-07Move local variables to narrower scopesLibravatar Benjamin Kramer1-2/+1
2009-02-09show_patch_diff(): remove a call to fstat()Libravatar Kjetil Barvik1-3/+1
2008-12-17combine-diff.c: use strbuf_readlink()Libravatar Junio C Hamano1-5/+5
2008-10-25Always initialize xpparam_t to 0Libravatar Brian Downing1-0/+1
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerLibravatar Brandon Casey1-2/+1
2008-09-18Merge branch 'jc/diff-prefix'Libravatar Junio C Hamano1-2/+6
2008-09-07Merge branch 'jc/hide-cr-in-diff-from-less'Libravatar Junio C Hamano1-2/+14
2008-08-30diff: vary default prefix depending on what are comparedLibravatar Junio C Hamano1-2/+6
2008-08-30diff: Help "less" hide ^M from the outputLibravatar Junio C Hamano1-2/+14
2008-08-24Merge branch 'maint' to sync with 1.6.0.1Libravatar Junio C Hamano1-0/+12
2008-08-23Respect core.autocrlf in combined diffLibravatar Alexander Gavrilov1-0/+12