aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-28
|\
| * diff: don't load color config in plumbingJeff King2011-08-19
| * color: delay auto-color decision until point of useJeff King2011-08-19
| * git_config_colorbool: refactor stdout_is_tty handlingJeff King2011-08-18
| * diff: refactor COLOR_DIFF from a flag into an intJeff King2011-08-18
| * Merge branch 'jc/zlib-wrap' into maintJunio C Hamano2011-08-16
| |\
| * \ Merge branch 'jk/combine-diff-binary-etc' into maintJunio C Hamano2011-08-16
| |\ \
* | \ \ Merge branch 'rc/histogram-diff'Junio C Hamano2011-08-17
|\ \ \ \
| * | | | teach --histogram to diffTay Ray Chuan2011-07-12
| |/ / /
* | | | Merge branch 'jc/zlib-wrap'Junio C Hamano2011-07-19
|\ \ \ \ | | |_|/ | |/| |
| * | | zlib: zlib can only process 4GB at a timeJunio C Hamano2011-06-10
| * | | zlib: wrap deflateBound() tooJunio C Hamano2011-06-10
| * | | zlib: wrap deflate side of the APIJunio C Hamano2011-06-10
| * | | Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano2011-05-31
| |\ \ \
| * \ \ \ Merge branch 'jm/maint-diff-words-with-sbe' into maintJunio C Hamano2011-05-26
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jh/dirstat' into maintJunio C Hamano2011-05-04
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'mg/diff-stat-count'Junio C Hamano2011-06-29
|\ \ \ \ \ \ \ \
| * | | | | | | | diff --stat-count: finishing touchesJunio C Hamano2011-05-27
| * | | | | | | | diff: introduce --stat-lines to limit the stat linesMichael J Gruber2011-05-27
| * | | | | | | | diff.c: omit hidden entries from namelen calculation with --statMichael J Gruber2011-05-27
* | | | | | | | | Merge branch 'jk/combine-diff-binary-etc'Junio C Hamano2011-06-29
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | refactor get_textconv to not require diff_filespecJeff King2011-05-23
* | | | | | | | Merge branch 'jk/diff-not-so-quick'Junio C Hamano2011-06-06
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: futureproof "stop feeding the backend early" logicJunio C Hamano2011-05-31
* | | | | | | | | Merge branch 'jm/maint-diff-words-with-sbe'Junio C Hamano2011-05-23
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | do not read beyond end of malloc'd bufferJim Meyering2011-05-20
* | | | | | | | Merge branch 'jh/dirstat-lines'Junio C Hamano2011-05-13
|\ \ \ \ \ \ \ \
| * | | | | | | | Mark dirstat error messages for translationJohan Herland2011-04-29
| * | | | | | | | Improve error handling when parsing dirstat parametersJohan Herland2011-04-29
| * | | | | | | | New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland2011-04-29
| * | | | | | | | Allow specifying --dirstat cut-off percentage as a floating point numberJohan Herland2011-04-29
| * | | | | | | | Add config variable for specifying default --dirstat behaviorJohan Herland2011-04-29
| * | | | | | | | Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-fileJohan Herland2011-04-29
| * | | | | | | | Make --dirstat=0 output directories that contribute < 0.1% of changesJohan Herland2011-04-29
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano2011-05-06
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | diff: remove often unused parameters from diff_unmerge()Junio C Hamano2011-04-23
| * | | | | | diff.c: return filepair from diff_unmerge()Junio C Hamano2011-04-23
* | | | | | | Merge branch 'jc/diff-irreversible-delete'Junio C Hamano2011-04-28
|\ \ \ \ \ \ \
| * | | | | | | git diff -D: omit the preimage of deletesJunio C Hamano2011-04-02
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano2011-04-28
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-22
* | | | | | | Merge branch 'jh/dirstat'Junio C Hamano2011-04-28
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | --dirstat: In case of renames, use target filename instead of source filenameJohan Herland2011-04-12
| * | | | | Teach --dirstat not to completely ignore rearranged lines within a fileJohan Herland2011-04-11
| * | | | | --dirstat-by-file: Make it faster and more correctJohan Herland2011-04-11
* | | | | | Remove unused variablesJohannes Schindelin2011-03-22
| |/ / / / |/| | | |
* | | | | Fix sparse warningsStephen Boyd2011-03-22
* | | | | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | bump rename limit defaults (again)Jeff King2011-02-21
| |/ / /