summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/diff-algo-cleanup' into maintJunio C Hamano2012-05-111-2/+2
|\
| * xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanupJunio C Hamano2012-02-191-2/+2
* | Merge branch 'lp/diffstat-with-graph' into maintJunio C Hamano2012-05-101-2/+6
|\ \
| * | Prevent graph_width of stat width from falling below minLucian Poston2012-04-181-1/+5
| * | Adjust stat width calculations to take --graph output into accountLucian Poston2012-04-161-1/+1
* | | Merge branch 'lp/maint-diff-three-dash-with-graph' into maintJunio C Hamano2012-05-011-0/+6
|\ \ \
| * | | log --graph: fix break in graph linesLucian Poston2012-03-201-0/+6
| * | | Merge branch 'jc/maint-diffstat-numstat-context' into maintJunio C Hamano2011-11-011-0/+2
| |\ \ \
| * \ \ \ Merge branch 'rs/diff-cleanup-records-fix' into maintJunio C Hamano2011-10-211-0/+4
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano2012-04-261-0/+5
|\ \ \ \ \ \
| * | | | | | teach diffcore-rename to optionally ignore empty contentJeff King2012-03-231-0/+5
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'tr/maint-word-diff-regex-sticky' into maintJunio C Hamano2012-04-261-56/+66
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | diff: tweak a _copy_ of diff_options with word-difftr/maint-word-diff-regex-stickyThomas Rast2012-03-141-1/+4
| * | | | | diff: refactor the word-diff setup from builtin_diff_cmdThomas Rast2012-03-141-56/+63
| * | | | | Merge branch 'jc/maint-diff-patch-header' into maintJunio C Hamano2012-03-121-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/diff-stat-scaler' into maintJunio C Hamano2012-02-211-7/+20
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jc/maint-diff-patch-header'Junio C Hamano2012-03-061-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | diff -p: squelch "diff --git" header for stat-dirty pathsjc/maint-diff-patch-headerJunio C Hamano2012-03-011-1/+1
* | | | | | | | Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-061-27/+87
|\ \ \ \ \ \ \ \
| * | | | | | | | diff --stat: add config option to limit graph widthzj/diff-stat-dyncolZbigniew Jędrzejewski-Szmek2012-03-011-0/+8
| * | | | | | | | diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek2012-03-011-2/+21
| * | | | | | | | diff --stat: use a maximum of 5/8 for the filename partZbigniew Jędrzejewski-Szmek2012-03-011-30/+60
| * | | | | | | | diff --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-011-1/+4
| | | | | | | | |
| | \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scalerJunio C Hamano2012-02-241-7/+20
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | |
* | | | | | | | | Merge branch 'jc/diff-stat-scaler'Junio C Hamano2012-02-201-7/+20
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | diff --stat: show bars of same length for paths with same amount of changesjc/diff-stat-scalerJunio C Hamano2012-02-141-7/+20
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/userdiff-config-simplify'Junio C Hamano2012-02-141-5/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | drop odd return value semantics from userdiff_configjk/userdiff-config-simplifyJeff King2012-02-071-5/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Use correct grammar in diffstat summary linend/diffstat-gramnumNguyễn Thái Ngọc Duy2012-02-031-5/+51
|/ / / / / /
* | | | | | Merge branch 'tr/maint-word-diff-incomplete-line'Junio C Hamano2012-01-181-0/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | word-diff: ignore '\ No newline at eof' markertr/maint-word-diff-incomplete-lineThomas Rast2012-01-121-0/+9
* | | | | | Merge branch 'rs/diff-whole-function'Junio C Hamano2011-10-191-0/+8
|\ \ \ \ \ \
| * | | | | | diff: add option to show whole functions as contextrs/diff-whole-functionRené Scharfe2011-10-101-0/+8
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rs/diff-cleanup-records-fix'Junio C Hamano2011-10-131-0/+4
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | diff: resurrect XDF_NEED_MINIMAL with --minimalJunio C Hamano2011-10-031-0/+4
* | | | | | Merge branch 'jc/maint-diffstat-numstat-context'Junio C Hamano2011-10-101-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | diff: teach --stat/--numstat to honor -U$numJunio C Hamano2011-09-221-0/+2
* | | | | Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-281-28/+25
|\ \ \ \ \
| * | | | | diff: don't load color config in plumbingJeff King2011-08-191-1/+4
| * | | | | color: delay auto-color decision until point of useJeff King2011-08-191-10/+7
| * | | | | git_config_colorbool: refactor stdout_is_tty handlingJeff King2011-08-181-2/+2
| * | | | | diff: refactor COLOR_DIFF from a flag into an intJeff King2011-08-181-22/+19
| | |_|/ / | |/| | |
| * | | | Merge branch 'jc/zlib-wrap' into maintJunio C Hamano2011-08-161-5/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/combine-diff-binary-etc' into maintJunio C Hamano2011-08-161-13/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'rc/histogram-diff'Junio C Hamano2011-08-171-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | teach --histogram to diffTay Ray Chuan2011-07-121-0/+2
| |/ / / / /
* | | | | | Merge branch 'jc/zlib-wrap'Junio C Hamano2011-07-191-5/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | zlib: zlib can only process 4GB at a timeJunio C Hamano2011-06-101-1/+1
| * | | | | zlib: wrap deflateBound() tooJunio C Hamano2011-06-101-1/+1
| * | | | | zlib: wrap deflate side of the APIJunio C Hamano2011-06-101-3/+3
View Lorry Controller Status