summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2012-03-06Merge branch 'jc/maint-diff-patch-header'Junio C Hamano
2012-03-06Merge branch 'zj/diff-stat-dyncol'Junio C Hamano
2012-03-01diff -p: squelch "diff --git" header for stat-dirty pathsJunio C Hamano
2012-03-01diff --stat: add config option to limit graph widthZbigniew Jędrzejewski-Szmek
2012-03-01diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek
2012-03-01diff --stat: use a maximum of 5/8 for the filename partZbigniew Jędrzejewski-Szmek
2012-03-01diff --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek
2012-02-25Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scalerJunio C Hamano
2012-02-20Merge branch 'jc/diff-stat-scaler'Junio C Hamano
2012-02-14diff --stat: show bars of same length for paths with same amount of changesJunio C Hamano
2012-02-14Merge branch 'jk/userdiff-config-simplify'Junio C Hamano
2012-02-07drop odd return value semantics from userdiff_configJeff King
2012-02-04Use correct grammar in diffstat summary lineNguyễn Thái Ngọc Duy
2012-01-18Merge branch 'tr/maint-word-diff-incomplete-line'Junio C Hamano
2012-01-12word-diff: ignore '\ No newline at eof' markerThomas Rast
2011-10-19Merge branch 'rs/diff-whole-function'Junio C Hamano
2011-10-14Merge branch 'rs/diff-cleanup-records-fix'Junio C Hamano
2011-10-10Merge branch 'jc/maint-diffstat-numstat-context'Junio C Hamano
2011-10-10diff: add option to show whole functions as contextRené Scharfe
2011-10-03diff: resurrect XDF_NEED_MINIMAL with --minimalJunio C Hamano
2011-09-22diff: teach --stat/--numstat to honor -U$numJunio C Hamano
2011-08-29Merge branch 'jk/color-and-pager'Junio C Hamano
2011-08-19diff: don't load color config in plumbingJeff King
2011-08-19color: delay auto-color decision until point of useJeff King
2011-08-18git_config_colorbool: refactor stdout_is_tty handlingJeff King
2011-08-18diff: refactor COLOR_DIFF from a flag into an intJeff King
2011-08-18Merge branch 'rc/histogram-diff'Junio C Hamano
2011-08-16Merge branch 'jc/zlib-wrap' into maintJunio C Hamano
2011-08-16Merge branch 'jk/combine-diff-binary-etc' into maintJunio C Hamano
2011-07-19Merge branch 'jc/zlib-wrap'Junio C Hamano
2011-07-12teach --histogram to diffTay Ray Chuan
2011-06-30Merge branch 'mg/diff-stat-count'Junio C Hamano
2011-06-30Merge branch 'jk/combine-diff-binary-etc'Junio C Hamano
2011-06-10zlib: zlib can only process 4GB at a timeJunio C Hamano
2011-06-10zlib: wrap deflateBound() tooJunio C Hamano
2011-06-10zlib: wrap deflate side of the APIJunio C Hamano
2011-06-06Merge branch 'jk/diff-not-so-quick'Junio C Hamano
2011-05-31Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano
2011-05-31diff: futureproof "stop feeding the backend early" logicJunio C Hamano
2011-05-28diff --stat-count: finishing touchesJunio C Hamano
2011-05-27diff: introduce --stat-lines to limit the stat linesMichael J Gruber
2011-05-27diff.c: omit hidden entries from namelen calculation with --statMichael J Gruber
2011-05-26Merge branch 'jm/maint-diff-words-with-sbe' into maintJunio C Hamano
2011-05-23refactor get_textconv to not require diff_filespecJeff King
2011-05-23Merge branch 'jm/maint-diff-words-with-sbe'Junio C Hamano
2011-05-20do not read beyond end of malloc'd bufferJim Meyering
2011-05-13Merge branch 'jh/dirstat-lines'Junio C Hamano
2011-05-13Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano
2011-05-06Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano
2011-05-04Merge branch 'jh/dirstat' into maintJunio C Hamano