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