summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2012-05-11Merge branch 'jc/diff-algo-cleanup' into maintJunio C Hamano
2012-05-10Merge branch 'lp/diffstat-with-graph' into maintJunio C Hamano
2012-05-02Merge branch 'lp/maint-diff-three-dash-with-graph' into maintJunio C Hamano
2012-04-26Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano
2012-04-26Merge branch 'tr/maint-word-diff-regex-sticky' into maintJunio C Hamano
2012-04-18Prevent graph_width of stat width from falling below minLucian Poston
2012-04-16Adjust stat width calculations to take --graph output into accountLucian Poston
2012-03-23teach diffcore-rename to optionally ignore empty contentJeff King
2012-03-20log --graph: fix break in graph linesLucian Poston
2012-03-14diff: tweak a _copy_ of diff_options with word-diffThomas Rast
2012-03-14diff: refactor the word-diff setup from builtin_diff_cmdThomas Rast
2012-03-12Merge branch 'jc/maint-diff-patch-header' into maintJunio C Hamano
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-21Merge branch 'jc/diff-stat-scaler' into maintJunio C Hamano
2012-02-20Merge branch 'jc/diff-stat-scaler'Junio C Hamano
2012-02-19xdiff: PATIENCE/HISTOGRAM are not independent option bitsJunio 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-11-01Merge branch 'jc/maint-diffstat-numstat-context' into maintJunio C Hamano
2011-10-21Merge branch 'rs/diff-cleanup-records-fix' into maintJunio C Hamano
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
generated by cgit v0.10.2-6-g49f6 at 2024-04-23 12:44:38 (GMT)