Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
* | Merge branch 'jc/maint-diff-patch-header' | Junio C Hamano | 2012-03-06 | |
|\ | ||||
| * | diff -p: squelch "diff --git" header for stat-dirty paths | Junio C Hamano | 2012-03-01 | |
* | | Merge branch 'zj/diff-stat-dyncol' | Junio C Hamano | 2012-03-06 | |
|\ \ | ||||
| * | | diff --stat: add config option to limit graph width | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | |
| * | | diff --stat: enable limiting of the graph part | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | |
| * | | diff --stat: use a maximum of 5/8 for the filename part | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | |
| * | | diff --stat: use the full terminal width | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | |
| | | | ||||
| | \ | ||||
| *-. \ | Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scaler | Junio C Hamano | 2012-02-24 | |
| |\ \ \ | ||||
* | \ \ \ | Merge branch 'jc/diff-stat-scaler' | Junio C Hamano | 2012-02-20 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||
| * | | | | diff --stat: show bars of same length for paths with same amount of changes | Junio C Hamano | 2012-02-14 | |
| | |/ / | |/| | | ||||
* | | | | Merge branch 'jk/userdiff-config-simplify' | Junio C Hamano | 2012-02-14 | |
|\ \ \ \ | ||||
| * | | | | drop odd return value semantics from userdiff_config | Jeff King | 2012-02-07 | |
| | |/ / | |/| | | ||||
* | | | | Use correct grammar in diffstat summary line | Nguyễn Thái Ngọc Duy | 2012-02-03 | |
|/ / / | ||||
* | | | Merge branch 'tr/maint-word-diff-incomplete-line' | Junio C Hamano | 2012-01-18 | |
|\ \ \ | |/ / |/| | | ||||
| * | | word-diff: ignore '\ No newline at eof' marker | Thomas Rast | 2012-01-12 | |
* | | | Merge branch 'rs/diff-whole-function' | Junio C Hamano | 2011-10-19 | |
|\ \ \ | ||||
| * | | | diff: add option to show whole functions as context | René Scharfe | 2011-10-10 | |
* | | | | Merge branch 'rs/diff-cleanup-records-fix' | Junio C Hamano | 2011-10-13 | |
|\ \ \ \ | ||||
| * | | | | diff: resurrect XDF_NEED_MINIMAL with --minimal | Junio C Hamano | 2011-10-03 | |
* | | | | | Merge branch 'jc/maint-diffstat-numstat-context' | Junio C Hamano | 2011-10-10 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||
| * | | | | diff: teach --stat/--numstat to honor -U$num | Junio C Hamano | 2011-09-22 | |
* | | | | | Merge branch 'jk/color-and-pager' | Junio C Hamano | 2011-08-28 | |
|\ \ \ \ \ | ||||
| * | | | | | diff: don't load color config in plumbing | Jeff King | 2011-08-19 | |
| * | | | | | color: delay auto-color decision until point of use | Jeff King | 2011-08-19 | |
| * | | | | | git_config_colorbool: refactor stdout_is_tty handling | Jeff King | 2011-08-18 | |
| * | | | | | diff: refactor COLOR_DIFF from a flag into an int | Jeff King | 2011-08-18 | |
| | |_|/ / | |/| | | | ||||
| * | | | | Merge branch 'jc/zlib-wrap' into maint | Junio C Hamano | 2011-08-16 | |
| |\ \ \ \ | ||||
| * \ \ \ \ | Merge branch 'jk/combine-diff-binary-etc' into maint | Junio C Hamano | 2011-08-16 | |
| |\ \ \ \ \ | ||||
* | \ \ \ \ \ | Merge branch 'rc/histogram-diff' | Junio C Hamano | 2011-08-17 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||
| * | | | | | | teach --histogram to diff | Tay Ray Chuan | 2011-07-12 | |
| |/ / / / / | ||||
* | | | | | | Merge branch 'jc/zlib-wrap' | Junio C Hamano | 2011-07-19 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||
| * | | | | | zlib: zlib can only process 4GB at a time | Junio C Hamano | 2011-06-10 | |
| * | | | | | zlib: wrap deflateBound() too | Junio C Hamano | 2011-06-10 | |
| * | | | | | zlib: wrap deflate side of the API | Junio C Hamano | 2011-06-10 | |
| * | | | | | Merge branch 'jc/rename-degrade-cc-to-c' into maint | Junio C Hamano | 2011-05-31 | |
| |\ \ \ \ \ | ||||
| * \ \ \ \ \ | Merge branch 'jm/maint-diff-words-with-sbe' into maint | Junio C Hamano | 2011-05-26 | |
| |\ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ | Merge branch 'jc/fix-diff-files-unmerged' into maint | Junio C Hamano | 2011-05-13 | |
| |\ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ | Merge branch 'jh/dirstat' into maint | Junio C Hamano | 2011-05-04 | |
| |\ \ \ \ \ \ \ \ | ||||
* | \ \ \ \ \ \ \ \ | Merge branch 'mg/diff-stat-count' | Junio C Hamano | 2011-06-29 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | diff --stat-count: finishing touches | Junio C Hamano | 2011-05-27 | |
| * | | | | | | | | | | diff: introduce --stat-lines to limit the stat lines | Michael J Gruber | 2011-05-27 | |
| * | | | | | | | | | | diff.c: omit hidden entries from namelen calculation with --stat | Michael J Gruber | 2011-05-27 | |
* | | | | | | | | | | | Merge branch 'jk/combine-diff-binary-etc' | Junio C Hamano | 2011-06-29 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||
| * | | | | | | | | | refactor get_textconv to not require diff_filespec | Jeff King | 2011-05-23 | |
* | | | | | | | | | | Merge branch 'jk/diff-not-so-quick' | Junio C Hamano | 2011-06-06 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | diff: futureproof "stop feeding the backend early" logic | Junio C Hamano | 2011-05-31 | |
* | | | | | | | | | | | Merge branch 'jm/maint-diff-words-with-sbe' | Junio C Hamano | 2011-05-23 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||
| * | | | | | | | | | do not read beyond end of malloc'd buffer | Jim Meyering | 2011-05-20 | |
* | | | | | | | | | | Merge branch 'jh/dirstat-lines' | Junio C Hamano | 2011-05-13 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | Mark dirstat error messages for translation | Johan Herland | 2011-04-29 |