summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2012-07-31Merge branch 'nd/maint-i18n-diffstat'Junio C Hamano
2012-07-26i18n: leave \n out of translated diffstatNguyễn Thái Ngọc Duy
2012-07-24Merge branch 'jv/maint-no-ext-diff'Junio C Hamano
2012-07-18diff: correctly disable external_diff with --no-ext-diffJunio C Hamano
2012-07-13Merge branch 'jc/refactor-diff-stdin'Junio C Hamano
2012-06-28diff-index.c: "git diff" has no need to read blob from the standard inputJunio C Hamano
2012-06-15Merge branch 'as/diff-shortstat-ignore-binary'Junio C Hamano
2012-06-15diff: Only count lines in show_shortstatsAlexander Strasser
2012-05-07Merge branch 'zj/diff-empty-chmod'Junio C Hamano
2012-05-02Merge branch 'zj/diff-stat-smaller-num-columns'Junio C Hamano
2012-05-02Merge branch 'lp/diffstat-with-graph'Junio C Hamano
2012-05-02diff --stat: do not run diff on indentical filesZbigniew Jędrzejewski-Szmek
2012-05-02diff --stat: report mode-only changes for binary files like text filesZbigniew Jędrzejewski-Szmek
2012-04-30diff --stat: use less columns for change countsZbigniew Jędrzejewski-Szmek
2012-04-23Merge branch 'lp/maint-diff-three-dash-with-graph'Junio C Hamano
2012-04-18Prevent graph_width of stat width from falling below minLucian Poston
2012-04-16Merge branch 'jk/diff-no-rename-empty'Junio C Hamano
2012-04-16Adjust stat width calculations to take --graph output into accountLucian Poston
2012-04-16Merge branch 'tr/maint-word-diff-regex-sticky'Junio C Hamano
2012-04-16Merge branch 'jc/diff-algo-cleanup'Junio C Hamano
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