| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'zj/diff-empty-chmod' | Junio C Hamano | 2012-05-07 | 1 | -16/+27 |
|\ |
|
| * | diff --stat: do not run diff on indentical files | Zbigniew Jędrzejewski-Szmek | 2012-05-01 | 1 | -2/+5 |
| * | diff --stat: report mode-only changes for binary files like text files | Zbigniew Jędrzejewski-Szmek | 2012-05-01 | 1 | -15/+23 |
* | | Merge branch 'zj/diff-stat-smaller-num-columns' | Junio C Hamano | 2012-05-02 | 1 | -10/+38 |
|\ \ |
|
| * | | diff --stat: use less columns for change counts | Zbigniew Jędrzejewski-Szmek | 2012-04-30 | 1 | -10/+38 |
| |/ |
|
* | | Merge branch 'lp/diffstat-with-graph' | Junio C Hamano | 2012-05-02 | 1 | -2/+6 |
|\ \
| |/
|/| |
|
| * | Prevent graph_width of stat width from falling below min | Lucian Poston | 2012-04-18 | 1 | -1/+5 |
| * | Adjust stat width calculations to take --graph output into account | Lucian Poston | 2012-04-16 | 1 | -1/+1 |
* | | Merge branch 'lp/maint-diff-three-dash-with-graph' | Junio C Hamano | 2012-04-23 | 1 | -0/+6 |
|\ \ |
|
| * | | log --graph: fix break in graph lines | Lucian Poston | 2012-03-20 | 1 | -0/+6 |
| * | | Merge branch 'jc/maint-diffstat-numstat-context' into maint | Junio C Hamano | 2011-11-01 | 1 | -0/+2 |
| |\ \ |
|
| * \ \ | Merge branch 'rs/diff-cleanup-records-fix' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+4 |
| |\ \ \ |
|
* | \ \ \ | Merge branch 'jk/diff-no-rename-empty' | Junio C Hamano | 2012-04-16 | 1 | -0/+5 |
|\ \ \ \ \ |
|
| * | | | | | teach diffcore-rename to optionally ignore empty content | Jeff King | 2012-03-23 | 1 | -0/+5 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge branch 'tr/maint-word-diff-regex-sticky' | Junio C Hamano | 2012-04-15 | 1 | -56/+66 |
|\ \ \ \ \ |
|
| * | | | | | diff: tweak a _copy_ of diff_options with word-difftr/maint-word-diff-regex-sticky | Thomas Rast | 2012-03-14 | 1 | -1/+4 |
| * | | | | | diff: refactor the word-diff setup from builtin_diff_cmd | Thomas Rast | 2012-03-14 | 1 | -56/+63 |
| * | | | | | Merge branch 'jc/maint-diff-patch-header' into maint | Junio C Hamano | 2012-03-12 | 1 | -1/+1 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'jc/diff-stat-scaler' into maint | Junio C Hamano | 2012-02-21 | 1 | -7/+20 |
| |\ \ \ \ \ \ |
|
* | \ \ \ \ \ \ | Merge branch 'jc/diff-algo-cleanup' | Junio C Hamano | 2012-04-15 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \
| |_|_|_|/ / / /
|/| | | | | | | |
|
| * | | | | | | | xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanup | Junio C Hamano | 2012-02-19 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'jc/maint-diff-patch-header' | Junio C Hamano | 2012-03-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \
| | |_|_|/ / / /
| |/| | | | | | |
|
| * | | | | | | | diff -p: squelch "diff --git" header for stat-dirty pathsjc/maint-diff-patch-header | Junio C Hamano | 2012-03-01 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'zj/diff-stat-dyncol' | Junio C Hamano | 2012-03-06 | 1 | -27/+87 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | diff --stat: add config option to limit graph widthzj/diff-stat-dyncol | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -0/+8 |
| * | | | | | | | | diff --stat: enable limiting of the graph part | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -2/+21 |
| * | | | | | | | | diff --stat: use a maximum of 5/8 for the filename part | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -30/+60 |
| * | | | | | | | | diff --stat: use the full terminal width | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -1/+4 |
| | | | | | | | | | |
| | \ \ \ \ \ \ \ | |
| *-. \ \ \ \ \ \ \ | Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scaler | Junio C Hamano | 2012-02-24 | 1 | -7/+20 |
| |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | / / / /
| | | |_|_|/ / / /
| | |/| | | | | | |
|
* | | | | | | | | | Merge branch 'jc/diff-stat-scaler' | Junio C Hamano | 2012-02-20 | 1 | -7/+20 |
|\ \ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | | | | | |
|
| * | | | | | | | | diff --stat: show bars of same length for paths with same amount of changesjc/diff-stat-scaler | Junio C Hamano | 2012-02-14 | 1 | -7/+20 |
| | |/ / / / / /
| |/| | | | | | |
|
* | | | | | | | | Merge branch 'jk/userdiff-config-simplify' | Junio C Hamano | 2012-02-14 | 1 | -5/+2 |
|\ \ \ \ \ \ \ \
| |_|_|_|/ / / /
|/| | | | | | | |
|
| * | | | | | | | drop odd return value semantics from userdiff_configjk/userdiff-config-simplify | Jeff King | 2012-02-07 | 1 | -5/+2 |
| | |/ / / / /
| |/| | | | | |
|
* | | | | | | | Use correct grammar in diffstat summary linend/diffstat-gramnum | Nguyễn Thái Ngọc Duy | 2012-02-03 | 1 | -5/+51 |
|/ / / / / / |
|
* | | | | | | Merge branch 'tr/maint-word-diff-incomplete-line' | Junio C Hamano | 2012-01-18 | 1 | -0/+9 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | word-diff: ignore '\ No newline at eof' markertr/maint-word-diff-incomplete-line | Thomas Rast | 2012-01-12 | 1 | -0/+9 |
* | | | | | | Merge branch 'rs/diff-whole-function' | Junio C Hamano | 2011-10-19 | 1 | -0/+8 |
|\ \ \ \ \ \ |
|
| * | | | | | | diff: add option to show whole functions as contextrs/diff-whole-function | René Scharfe | 2011-10-10 | 1 | -0/+8 |
| | |_|/ / /
| |/| | | | |
|
* | | | | | | Merge branch 'rs/diff-cleanup-records-fix' | Junio C Hamano | 2011-10-13 | 1 | -0/+4 |
|\ \ \ \ \ \
| | |_|_|/ /
| |/| | | | |
|
| * | | | | | diff: resurrect XDF_NEED_MINIMAL with --minimal | Junio C Hamano | 2011-10-03 | 1 | -0/+4 |
* | | | | | | Merge branch 'jc/maint-diffstat-numstat-context' | Junio C Hamano | 2011-10-10 | 1 | -0/+2 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | /
| | |_|_|/
| |/| | | |
|
| * | | | | diff: teach --stat/--numstat to honor -U$num | Junio C Hamano | 2011-09-22 | 1 | -0/+2 |
* | | | | | Merge branch 'jk/color-and-pager' | Junio C Hamano | 2011-08-28 | 1 | -28/+25 |
|\ \ \ \ \ |
|
| * | | | | | diff: don't load color config in plumbing | Jeff King | 2011-08-19 | 1 | -1/+4 |
| * | | | | | color: delay auto-color decision until point of use | Jeff King | 2011-08-19 | 1 | -10/+7 |
| * | | | | | git_config_colorbool: refactor stdout_is_tty handling | Jeff King | 2011-08-18 | 1 | -2/+2 |
| * | | | | | diff: refactor COLOR_DIFF from a flag into an int | Jeff King | 2011-08-18 | 1 | -22/+19 |
| | |_|/ /
| |/| | | |
|
| * | | | | Merge branch 'jc/zlib-wrap' into maint | Junio C Hamano | 2011-08-16 | 1 | -5/+5 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge branch 'jk/combine-diff-binary-etc' into maint | Junio C Hamano | 2011-08-16 | 1 | -13/+1 |
| |\ \ \ \ \ |
|
* | \ \ \ \ \ | Merge branch 'rc/histogram-diff' | Junio C Hamano | 2011-08-17 | 1 | -0/+2 |
|\ \ \ \ \ \ \
| |_|_|_|_|/ /
|/| | | | | | |
|