Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | 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 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | teach --histogram to diff | Tay Ray Chuan | 2011-07-12 | 1 | -0/+2 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'jc/zlib-wrap' | Junio C Hamano | 2011-07-19 | 1 | -5/+5 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | zlib: zlib can only process 4GB at a time | Junio C Hamano | 2011-06-10 | 1 | -1/+1 | |
| * | | | | | zlib: wrap deflateBound() too | Junio C Hamano | 2011-06-10 | 1 | -1/+1 | |
| * | | | | | zlib: wrap deflate side of the API | Junio C Hamano | 2011-06-10 | 1 | -3/+3 | |
| * | | | | | Merge branch 'jc/rename-degrade-cc-to-c' into maint | Junio C Hamano | 2011-05-31 | 1 | -0/+26 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'jm/maint-diff-words-with-sbe' into maint | Junio C Hamano | 2011-05-26 | 1 | -2/+10 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'jc/fix-diff-files-unmerged' into maint | Junio C Hamano | 2011-05-13 | 1 | -6/+6 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'jh/dirstat' into maint | Junio C Hamano | 2011-05-04 | 1 | -5/+37 | |
| |\ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ | Merge branch 'mg/diff-stat-count' | Junio C Hamano | 2011-06-29 | 1 | -9/+45 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | diff --stat-count: finishing touches | Junio C Hamano | 2011-05-27 | 1 | -2/+4 | |
| * | | | | | | | | | | diff: introduce --stat-lines to limit the stat lines | Michael J Gruber | 2011-05-27 | 1 | -4/+34 | |
| * | | | | | | | | | | diff.c: omit hidden entries from namelen calculation with --stat | Michael J Gruber | 2011-05-27 | 1 | -5/+9 | |
* | | | | | | | | | | | Merge branch 'jk/combine-diff-binary-etc' | Junio C Hamano | 2011-06-29 | 1 | -13/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | refactor get_textconv to not require diff_filespec | Jeff King | 2011-05-23 | 1 | -13/+1 | |
* | | | | | | | | | | Merge branch 'jk/diff-not-so-quick' | Junio C Hamano | 2011-06-06 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | diff: futureproof "stop feeding the backend early" logic | Junio C Hamano | 2011-05-31 | 1 | -0/+7 | |
* | | | | | | | | | | | Merge branch 'jm/maint-diff-words-with-sbe' | Junio C Hamano | 2011-05-23 | 1 | -2/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | do not read beyond end of malloc'd buffer | Jim Meyering | 2011-05-20 | 1 | -2/+10 | |
* | | | | | | | | | | Merge branch 'jh/dirstat-lines' | Junio C Hamano | 2011-05-13 | 1 | -19/+152 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Mark dirstat error messages for translation | Johan Herland | 2011-04-29 | 1 | -4/+4 |