aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* Merge branch 'zj/diff-empty-chmod'Junio C Hamano2012-05-07
|\
| * diff --stat: do not run diff on indentical filesZbigniew Jędrzejewski-Szmek2012-05-01
| * diff --stat: report mode-only changes for binary files like text filesZbigniew Jędrzejewski-Szmek2012-05-01
* | Merge branch 'zj/diff-stat-smaller-num-columns'Junio C Hamano2012-05-02
|\ \
| * | diff --stat: use less columns for change countsZbigniew Jędrzejewski-Szmek2012-04-30
| |/
* | Merge branch 'lp/diffstat-with-graph'Junio C Hamano2012-05-02
|\ \ | |/ |/|
| * Prevent graph_width of stat width from falling below minLucian Poston2012-04-18
| * Adjust stat width calculations to take --graph output into accountLucian Poston2012-04-16
* | Merge branch 'lp/maint-diff-three-dash-with-graph'Junio C Hamano2012-04-23
|\ \
| * | log --graph: fix break in graph linesLucian Poston2012-03-20
| * | Merge branch 'jc/maint-diffstat-numstat-context' into maintJunio C Hamano2011-11-01
| |\ \
| * \ \ Merge branch 'rs/diff-cleanup-records-fix' into maintJunio C Hamano2011-10-21
| |\ \ \
* | \ \ \ Merge branch 'jk/diff-no-rename-empty'Junio C Hamano2012-04-16
|\ \ \ \ \
| * | | | | teach diffcore-rename to optionally ignore empty contentJeff King2012-03-23
| | |_|_|/ | |/| | |
* | | | | Merge branch 'tr/maint-word-diff-regex-sticky'Junio C Hamano2012-04-15
|\ \ \ \ \
| * | | | | diff: tweak a _copy_ of diff_options with word-diffThomas Rast2012-03-14
| * | | | | diff: refactor the word-diff setup from builtin_diff_cmdThomas Rast2012-03-14
| * | | | | Merge branch 'jc/maint-diff-patch-header' into maintJunio C Hamano2012-03-12
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/diff-stat-scaler' into maintJunio C Hamano2012-02-21
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jc/diff-algo-cleanup'Junio C Hamano2012-04-15
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | xdiff: PATIENCE/HISTOGRAM are not independent option bitsJunio C Hamano2012-02-19
* | | | | | | | Merge branch 'jc/maint-diff-patch-header'Junio C Hamano2012-03-06
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | diff -p: squelch "diff --git" header for stat-dirty pathsJunio C Hamano2012-03-01
* | | | | | | | Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-06
|\ \ \ \ \ \ \ \
| * | | | | | | | diff --stat: add config option to limit graph widthZbigniew Jędrzejewski-Szmek2012-03-01
| * | | | | | | | diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek2012-03-01
| * | | | | | | | diff --stat: use a maximum of 5/8 for the filename partZbigniew Jędrzejewski-Szmek2012-03-01
| * | | | | | | | diff --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-01
| | | | | | | | |
| | \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scalerJunio C Hamano2012-02-24
| |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | / / / / | | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'jc/diff-stat-scaler'Junio C Hamano2012-02-20
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | diff --stat: show bars of same length for paths with same amount of changesJunio C Hamano2012-02-14
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/userdiff-config-simplify'Junio C Hamano2012-02-14
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | drop odd return value semantics from userdiff_configJeff King2012-02-07
| | |/ / / / / | |/| | | | |
* | | | | | | Use correct grammar in diffstat summary lineNguyễn Thái Ngọc Duy2012-02-03
|/ / / / / /
* | | | | | Merge branch 'tr/maint-word-diff-incomplete-line'Junio C Hamano2012-01-18
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | word-diff: ignore '\ No newline at eof' markerThomas Rast2012-01-12
* | | | | | Merge branch 'rs/diff-whole-function'Junio C Hamano2011-10-19
|\ \ \ \ \ \
| * | | | | | diff: add option to show whole functions as contextRené Scharfe2011-10-10
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rs/diff-cleanup-records-fix'Junio C Hamano2011-10-13
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | diff: resurrect XDF_NEED_MINIMAL with --minimalJunio C Hamano2011-10-03
* | | | | | Merge branch 'jc/maint-diffstat-numstat-context'Junio C Hamano2011-10-10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | diff: teach --stat/--numstat to honor -U$numJunio C Hamano2011-09-22
* | | | | Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-28
|\ \ \ \ \
| * | | | | diff: don't load color config in plumbingJeff King2011-08-19
| * | | | | color: delay auto-color decision until point of useJeff King2011-08-19
| * | | | | git_config_colorbool: refactor stdout_is_tty handlingJeff King2011-08-18
| * | | | | diff: refactor COLOR_DIFF from a flag into an intJeff King2011-08-18
| | |_|/ / | |/| | |
| * | | | Merge branch 'jc/zlib-wrap' into maintJunio C Hamano2011-08-16
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/combine-diff-binary-etc' into maintJunio C Hamano2011-08-16
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'rc/histogram-diff'Junio C Hamano2011-08-17
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |