summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2012-02-24Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scalerLibravatar Junio C Hamano1-7/+20
2012-02-21Merge branch 'jc/diff-stat-scaler' into maintLibravatar Junio C Hamano1-7/+20
2012-02-20Merge branch 'jc/diff-stat-scaler'Libravatar Junio C Hamano1-7/+20
2012-02-19xdiff: PATIENCE/HISTOGRAM are not independent option bitsLibravatar Junio C Hamano1-2/+2
2012-02-14diff --stat: show bars of same length for paths with same amount of changesLibravatar Junio C Hamano1-7/+20
2012-02-14Merge branch 'jk/userdiff-config-simplify'Libravatar Junio C Hamano1-5/+2
2012-02-07drop odd return value semantics from userdiff_configLibravatar Jeff King1-5/+2
2012-02-03Use correct grammar in diffstat summary lineLibravatar Nguyễn Thái Ngọc Duy1-5/+51
2012-01-18Merge branch 'tr/maint-word-diff-incomplete-line'Libravatar Junio C Hamano1-0/+9
2012-01-12word-diff: ignore '\ No newline at eof' markerLibravatar Thomas Rast1-0/+9
2011-11-01Merge branch 'jc/maint-diffstat-numstat-context' into maintLibravatar Junio C Hamano1-0/+2
2011-10-21Merge branch 'rs/diff-cleanup-records-fix' into maintLibravatar Junio C Hamano1-0/+4
2011-10-19Merge branch 'rs/diff-whole-function'Libravatar Junio C Hamano1-0/+8
2011-10-13Merge branch 'rs/diff-cleanup-records-fix'Libravatar Junio C Hamano1-0/+4
2011-10-10Merge branch 'jc/maint-diffstat-numstat-context'Libravatar Junio C Hamano1-0/+2
2011-10-10diff: add option to show whole functions as contextLibravatar René Scharfe1-0/+8
2011-10-03diff: resurrect XDF_NEED_MINIMAL with --minimalLibravatar Junio C Hamano1-0/+4
2011-09-22diff: teach --stat/--numstat to honor -U$numLibravatar Junio C Hamano1-0/+2
2011-08-28Merge branch 'jk/color-and-pager'Libravatar Junio C Hamano1-28/+25
2011-08-19diff: don't load color config in plumbingLibravatar Jeff King1-1/+4
2011-08-19color: delay auto-color decision until point of useLibravatar Jeff King1-10/+7
2011-08-18git_config_colorbool: refactor stdout_is_tty handlingLibravatar Jeff King1-2/+2
2011-08-18diff: refactor COLOR_DIFF from a flag into an intLibravatar Jeff King1-22/+19
2011-08-17Merge branch 'rc/histogram-diff'Libravatar Junio C Hamano1-0/+2
2011-08-16Merge branch 'jc/zlib-wrap' into maintLibravatar Junio C Hamano1-5/+5
2011-08-16Merge branch 'jk/combine-diff-binary-etc' into maintLibravatar Junio C Hamano1-13/+1
2011-07-19Merge branch 'jc/zlib-wrap'Libravatar Junio C Hamano1-5/+5
2011-07-12teach --histogram to diffLibravatar Tay Ray Chuan1-0/+2
2011-06-29Merge branch 'mg/diff-stat-count'Libravatar Junio C Hamano1-9/+45
2011-06-29Merge branch 'jk/combine-diff-binary-etc'Libravatar Junio C Hamano1-13/+1
2011-06-10zlib: zlib can only process 4GB at a timeLibravatar Junio C Hamano1-1/+1
2011-06-10zlib: wrap deflateBound() tooLibravatar Junio C Hamano1-1/+1
2011-06-10zlib: wrap deflate side of the APILibravatar Junio C Hamano1-3/+3
2011-06-06Merge branch 'jk/diff-not-so-quick'Libravatar Junio C Hamano1-0/+7
2011-05-31Merge branch 'jc/rename-degrade-cc-to-c' into maintLibravatar Junio C Hamano1-0/+26
2011-05-31diff: futureproof "stop feeding the backend early" logicLibravatar Junio C Hamano1-0/+7
2011-05-27diff --stat-count: finishing touchesLibravatar Junio C Hamano1-2/+4
2011-05-27diff: introduce --stat-lines to limit the stat linesLibravatar Michael J Gruber1-4/+34
2011-05-27diff.c: omit hidden entries from namelen calculation with --statLibravatar Michael J Gruber1-5/+9
2011-05-26Merge branch 'jm/maint-diff-words-with-sbe' into maintLibravatar Junio C Hamano1-2/+10
2011-05-23refactor get_textconv to not require diff_filespecLibravatar Jeff King1-13/+1
2011-05-23Merge branch 'jm/maint-diff-words-with-sbe'Libravatar Junio C Hamano1-2/+10
2011-05-20do not read beyond end of malloc'd bufferLibravatar Jim Meyering1-2/+10
2011-05-13Merge branch 'jh/dirstat-lines'Libravatar Junio C Hamano1-19/+152
2011-05-13Merge branch 'jc/fix-diff-files-unmerged' into maintLibravatar Junio C Hamano1-6/+6
2011-05-06Merge branch 'jc/fix-diff-files-unmerged'Libravatar Junio C Hamano1-6/+6
2011-05-04Merge branch 'jh/dirstat' into maintLibravatar Junio C Hamano1-5/+37
2011-04-29Mark dirstat error messages for translationLibravatar Johan Herland1-4/+4
2011-04-29Improve error handling when parsing dirstat parametersLibravatar Johan Herland1-30/+41
2011-04-29New --dirstat=lines mode, doing dirstat analysis based on diffstatLibravatar Johan Herland1-2/+59