Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merge branch 'nd/maint-diffstat-summary' into maint | Junio C Hamano | 2012-09-20 | 1 | -6/+4 | |
|\ | ||||||
| * | Revert diffstat back to English | Nguyễn Thái Ngọc Duy | 2012-09-14 | 1 | -6/+4 | |
* | | Sync with 1.7.11.6 | Junio C Hamano | 2012-09-11 | 1 | -3/+2 | |
|\ \ | ||||||
| * \ | Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -0/+1 | |
| |\ \ | ||||||
| | * | | Fix '\ No newline...' annotation in rewrite diffs | Adam Butcher | 2012-08-05 | 1 | -0/+1 | |
| * | | | Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -3/+1 | |
| |\ \ \ | ||||||
| | * | | | diff_setup_done(): return void | Thomas Rast | 2012-08-03 | 1 | -3/+1 | |
* | | | | | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-09-10 | 1 | -6/+10 | |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | ||||||
| * | | | Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 | Junio C Hamano | 2012-09-10 | 1 | -6/+10 | |
| |\ \ \ | | |_|/ | |/| | | ||||||
| | * | | diff: do not use null sha1 as a sentinel value | Jeff King | 2012-07-29 | 1 | -6/+10 | |
| | |/ | ||||||
| * | | Merge branch 'jv/maint-no-ext-diff' into maint | Junio C Hamano | 2012-07-30 | 1 | -3/+5 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'jc/refactor-diff-stdin' into maint | Junio C Hamano | 2012-07-22 | 1 | -20/+1 | |
| |\ \ \ | ||||||
* | \ \ \ | Merge branch 'nd/maint-i18n-diffstat' | Junio C Hamano | 2012-07-31 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | i18n: leave \n out of translated diffstat | Nguyễn Thái Ngọc Duy | 2012-07-26 | 1 | -1/+1 | |
* | | | | | | Merge branch 'jv/maint-no-ext-diff' | Junio C Hamano | 2012-07-23 | 1 | -3/+5 | |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| * | | | | | diff: correctly disable external_diff with --no-ext-diff | Junio C Hamano | 2012-07-17 | 1 | -3/+5 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'jc/refactor-diff-stdin' | Junio C Hamano | 2012-07-13 | 1 | -20/+1 | |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | ||||||
| * | | | diff-index.c: "git diff" has no need to read blob from the standard input | Junio C Hamano | 2012-06-28 | 1 | -20/+1 | |
* | | | | Merge branch 'as/diff-shortstat-ignore-binary' | Junio C Hamano | 2012-06-15 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | diff: Only count lines in show_shortstats | Alexander Strasser | 2012-06-15 | 1 | -1/+1 | |
* | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | |