summaryrefslogtreecommitdiff
path: root/combine-diff.c
Commit message (Expand)AuthorAgeFilesLines
* combine-diff: coalesce lost lines optimallyAntoine Pelisse2013-03-251-64/+191
* Allow combined diff to ignore white-spacesAntoine Pelisse2013-03-141-7/+50
* Merge branch 'jk/diff-graph-cleanup'Junio C Hamano2013-02-141-17/+32
|\
| * combine-diff.c: teach combined diffs about line prefixJohn Keeping2013-02-121-17/+30
| * Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-271-2/+2
| |\
* | | combine-diff: lift 32-way limit of combined diffJunio C Hamano2013-02-031-14/+7
* | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-101-2/+2
|\ \ \ | |/ / |/| / | |/
| * diff: do not use null sha1 as a sentinel valueJeff King2012-07-291-2/+2
* | Merge branch 'rs/combine-diff-zero-context-at-the-beginning'Junio C Hamano2012-04-161-1/+1
|\ \ | |/ |/|
| * combine-diff: fix loop index underflowrs/combine-diff-zero-context-at-the-beginningRené Scharfe2012-03-251-1/+1
* | pass struct commit to diff_tree_combined_merge()René Scharfe2011-12-171-4/+3
* | use struct sha1_array in diff_tree_combined()René Scharfe2011-12-171-21/+13
* | Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-281-4/+3
|\ \
| * | diff: refactor COLOR_DIFF from a flag into an intJeff King2011-08-181-4/+3
* | | Merge branch 'jc/combine-diff-callback'Junio C Hamano2011-08-281-0/+69
|\ \ \
| * | | combine-diff: support format_callbackJunio C Hamano2011-08-201-0/+69
* | | | Merge branch 'jc/maint-combined-diff-work-tree'Junio C Hamano2011-08-171-4/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"Junio C Hamano2011-08-041-4/+10
| * | | Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-211-1/+1
| |\ \ \
* | | | | combine-diff: respect textconv attributesJeff King2011-05-241-9/+32
* | | | | combine-diff: handle binary files as binaryJeff King2011-05-231-2/+35
* | | | | combine-diff: calculate mode_differs earlierJeff King2011-05-231-2/+7
* | | | | combine-diff: split header printing into its own functionJeff King2011-05-231-61/+74
| |_|/ / |/| | |
* | | | Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-131-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | git diff too slow for a fileRené Scharfe2010-05-021-1/+1
* | | remove ecb parameter from xdi_diff_outf()René Scharfe2010-05-041-2/+1
|/ /
* | combined diff: correctly handle truncated fileThomas Rast2010-04-171-6/+8
* | Give the hunk comment its own colorBert Wesarg2009-11-281-1/+4
* | Merge branch 'maint'Junio C Hamano2009-07-221-15/+14
|\ \
| * | diff --cc: a lost line at the beginning of the file is shown incorrectlyJunio C Hamano2009-07-221-7/+9
| * | combine-diff.c: fix performance problem when folding common deleted linesJunio C Hamano2009-07-221-8/+5
* | | Use die_errno() instead of die() when checking syscallsThomas Rast2009-06-271-1/+1
|/ /
* | Fix a bunch of pointer declarations (codestyle)Felipe Contreras2009-05-011-2/+2
* | Merge branch 'maint'Junio C Hamano2009-04-291-9/+25
|\ \
| * \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-291-12/+26
| |\ \
| | * | diff -c -p: do not die on submodulesJunio C Hamano2009-04-291-12/+26
* | | | Merge branch 'kb/checkout-optim'Junio C Hamano2009-03-171-3/+1
|\ \ \ \
| * | | | show_patch_diff(): remove a call to fstat()Kjetil Barvik2009-02-091-3/+1
| |/ / /
* | | | Move local variables to narrower scopesBenjamin Kramer2009-03-071-2/+1
|/ / /
* | | combine-diff.c: use strbuf_readlink()Junio C Hamano2008-12-171-5/+5
* | | Always initialize xpparam_t to 0Brian Downing2008-10-251-0/+1
* | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-121-2/+1
* | | Merge branch 'jc/diff-prefix'Junio C Hamano2008-09-181-2/+6
|\ \ \
| * | | diff: vary default prefix depending on what are comparedJunio C Hamano2008-08-301-2/+6
* | | | Merge branch 'jc/hide-cr-in-diff-from-less'Junio C Hamano2008-09-071-2/+14
|\ \ \ \ | | |/ / | |/| |
| * | | diff: Help "less" hide ^M from the outputJunio C Hamano2008-08-301-2/+14
| |/ /
* | | Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano2008-08-241-0/+12
|\ \ \ | |/ /
| * | Respect core.autocrlf in combined diffAlexander Gavrilov2008-08-231-0/+12
* | | xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano2008-08-141-5/+2
* | | Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing2008-08-131-3/+2
|/ /
View Lorry Controller Status