aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/make-static'Junio C Hamano2012-09-18
|\
| * diff.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-15
* | Merge branch 'nd/maint-diffstat-summary'Junio C Hamano2012-09-17
|\ \ | |/ |/|
| * Revert diffstat back to EnglishNguyễn Thái Ngọc Duy2012-09-14
* | Merge branch 'ab/diff-write-incomplete-line'Junio C Hamano2012-08-27
|\ \
| * | Fix '\ No newline...' annotation in rewrite diffsAdam Butcher2012-08-05
| * | Merge branch 'jv/maint-no-ext-diff' into maintJunio C Hamano2012-07-30
| |\ \
| * \ \ Merge branch 'jc/refactor-diff-stdin' into maintJunio C Hamano2012-07-22
| |\ \ \
* | \ \ \ Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-27
|\ \ \ \ \
| * | | | | diff: do not use null sha1 as a sentinel valueJeff King2012-07-29
* | | | | | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-22
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | diff_setup_done(): return voidThomas Rast2012-08-03
| |/ / / /
* | | | | Merge branch 'nd/maint-i18n-diffstat'Junio C Hamano2012-07-31
|\ \ \ \ \
| * | | | | i18n: leave \n out of translated diffstatNguyễn Thái Ngọc Duy2012-07-26
* | | | | | Merge branch 'jv/maint-no-ext-diff'Junio C Hamano2012-07-23
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | diff: correctly disable external_diff with --no-ext-diffJunio C Hamano2012-07-17
| | |/ / / | |/| | |
* | | | | Merge branch 'jc/refactor-diff-stdin'Junio C Hamano2012-07-13
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | diff-index.c: "git diff" has no need to read blob from the standard inputJunio C Hamano2012-06-28
* | | | Merge branch 'as/diff-shortstat-ignore-binary'Junio C Hamano2012-06-15
|\ \ \ \
| * | | | diff: Only count lines in show_shortstatsAlexander Strasser2012-06-15
* | | | | Merge branch 'zj/diff-empty-chmod'Junio C Hamano2012-05-07
|\ \ \ \ \
| * | | | | diff --stat: do not run diff on indentical filesZbigniew Jędrzejewski-Szmek2012-05-01
| |/ / / /
| * | | | diff --stat: report mode-only changes for binary files like text filesZbigniew Jędrzejewski-Szmek2012-05-01
* | | | | Merge branch 'zj/diff-stat-smaller-num-columns'Junio C Hamano2012-05-02
|\ \ \ \ \
| * | | | | diff --stat: use less columns for change countsZbigniew Jędrzejewski-Szmek2012-04-30
| |/ / / /
* | | | | Merge branch 'lp/diffstat-with-graph'Junio C Hamano2012-05-02
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Prevent graph_width of stat width from falling below minLucian Poston2012-04-18
| * | | | Adjust stat width calculations to take --graph output into accountLucian Poston2012-04-16
* | | | | Merge branch 'lp/maint-diff-three-dash-with-graph'Junio C Hamano2012-04-23
|\ \ \ \ \
| * | | | | log --graph: fix break in graph linesLucian Poston2012-03-20
| * | | | | Merge branch 'jc/maint-diffstat-numstat-context' into maintJunio C Hamano2011-11-01
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/diff-cleanup-records-fix' into maintJunio C Hamano2011-10-21
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jk/diff-no-rename-empty'Junio C Hamano2012-04-16
|\ \ \ \ \ \ \ \
| * | | | | | | | teach diffcore-rename to optionally ignore empty contentJeff King2012-03-23
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'tr/maint-word-diff-regex-sticky'Junio C Hamano2012-04-15
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: tweak a _copy_ of diff_options with word-diffThomas Rast2012-03-14
| * | | | | | | | diff: refactor the word-diff setup from builtin_diff_cmdThomas Rast2012-03-14
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'jc/maint-diff-patch-header' into maintJunio C Hamano2012-03-12
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/diff-stat-scaler' into maintJunio C Hamano2012-02-21
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/diff-algo-cleanup'Junio C Hamano2012-04-15
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | xdiff: PATIENCE/HISTOGRAM are not independent option bitsJunio C Hamano2012-02-19
* | | | | | | | | Merge branch 'jc/maint-diff-patch-header'Junio C Hamano2012-03-06
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | diff -p: squelch "diff --git" header for stat-dirty pathsJunio C Hamano2012-03-01
* | | | | | | | | Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-06
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff --stat: add config option to limit graph widthZbigniew Jędrzejewski-Szmek2012-03-01
| * | | | | | | | | diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek2012-03-01
| * | | | | | | | | diff --stat: use a maximum of 5/8 for the filename partZbigniew Jędrzejewski-Szmek2012-03-01
| * | | | | | | | | diff --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek2012-03-01
| | | | | | | | | |
| | \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scalerJunio C Hamano2012-02-24
| |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | / / / / / | | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'jc/diff-stat-scaler'Junio C Hamano2012-02-20
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |