summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2011-06-06Merge branch 'jk/diff-not-so-quick'Libravatar Junio C Hamano1-0/+7
2011-05-31diff: futureproof "stop feeding the backend early" logicLibravatar Junio C Hamano1-0/+7
2011-05-23Merge branch 'jm/maint-diff-words-with-sbe'Libravatar Junio C Hamano1-2/+10
2011-05-20do not read beyond end of malloc'd bufferLibravatar Jim Meyering1-2/+10
2011-05-13Merge branch 'jh/dirstat-lines'Libravatar Junio C Hamano1-19/+152
2011-05-06Merge branch 'jc/fix-diff-files-unmerged'Libravatar Junio C Hamano1-6/+6
2011-04-29Mark dirstat error messages for translationLibravatar Johan Herland1-4/+4
2011-04-29Improve error handling when parsing dirstat parametersLibravatar Johan Herland1-30/+41
2011-04-29New --dirstat=lines mode, doing dirstat analysis based on diffstatLibravatar Johan Herland1-2/+59
2011-04-29Allow specifying --dirstat cut-off percentage as a floating point numberLibravatar Johan Herland1-10/+16
2011-04-29Add config variable for specifying default --dirstat behaviorLibravatar Johan Herland1-1/+9
2011-04-29Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-fileLibravatar Johan Herland1-9/+60
2011-04-29Make --dirstat=0 output directories that contribute < 0.1% of changesLibravatar Johan Herland1-2/+2
2011-04-28Merge branch 'jc/diff-irreversible-delete'Libravatar Junio C Hamano1-5/+14
2011-04-28Merge branch 'jc/rename-degrade-cc-to-c'Libravatar Junio C Hamano1-0/+26
2011-04-28Merge branch 'jh/dirstat'Libravatar Junio C Hamano1-5/+37
2011-04-23diff: remove often unused parameters from diff_unmerge()Libravatar Junio C Hamano1-4/+1
2011-04-23diff.c: return filepair from diff_unmerge()Libravatar Junio C Hamano1-5/+8
2011-04-12--dirstat: In case of renames, use target filename instead of source filenameLibravatar Johan Herland1-1/+1
2011-04-11Teach --dirstat not to completely ignore rearranged lines within a fileLibravatar Johan Herland1-1/+18
2011-04-11--dirstat-by-file: Make it faster and more correctLibravatar Johan Herland1-5/+20
2011-04-02git diff -D: omit the preimage of deletesLibravatar Junio C Hamano1-5/+14
2011-03-22diffcore-rename: fall back to -C when -C -C busts the rename limitLibravatar Junio C Hamano1-0/+26
2011-03-22Remove unused variablesLibravatar Johannes Schindelin1-2/+1
2011-03-22Fix sparse warningsLibravatar Stephen Boyd1-1/+1
2011-03-19Merge branch 'jk/merge-rename-ux'Libravatar Junio C Hamano1-1/+1
2011-03-16Merge branch 'jk/diffstat-binary' into maintLibravatar Junio C Hamano1-10/+21
2011-03-16standardize brace placement in struct definitionsLibravatar Jonathan Nieder1-4/+2
2011-02-22diff: don't retrieve binary blobs for diffstatLibravatar Jeff King1-4/+11
2011-02-22diff: handle diffstat of rewritten binary filesLibravatar Jeff King1-10/+14
2011-02-21bump rename limit defaults (again)Libravatar Jeff King1-1/+1
2010-12-21Merge branch 'ks/blame-worktree-textconv-cached'Libravatar Junio C Hamano1-2/+2
2010-12-19fill_textconv(): Don't get/put cache if sha1 is not validLibravatar Kirill Smelkov1-2/+2
2010-12-16Merge branch 'kb/diff-C-M-synonym'Libravatar Junio C Hamano1-8/+8
2010-12-10diff: use "find" instead of "detect" as prefix for long forms of -M and -CLibravatar Yann Dirson1-9/+9
2010-12-09Merge branch 'np/diff-in-corrupt-repository' into maintLibravatar Junio C Hamano1-2/+6
2010-12-09Merge branch 'cm/diff-check-at-eol' into maintLibravatar Junio C Hamano1-1/+1
2010-12-08Merge branch 'jk/diff-CBM'Libravatar Junio C Hamano1-3/+3
2010-11-29Merge branch 'np/diff-in-corrupt-repository'Libravatar Junio C Hamano1-2/+6
2010-11-29Merge branch 'cm/diff-check-at-eol'Libravatar Junio C Hamano1-1/+1
2010-11-29diff: add --detect-copies-harder as a synonym for --find-copies-harderLibravatar Kevin Ballard1-1/+1
2010-11-24Merge branch 'cb/diff-fname-optim' into maintLibravatar Junio C Hamano1-1/+1
2010-11-24Merge branch 'jk/no-textconv-symlink' into maintLibravatar Junio C Hamano1-3/+8
2010-11-17Merge branch 'cb/diff-fname-optim'Libravatar Junio C Hamano1-1/+1
2010-11-17Merge branch 'jk/no-textconv-symlink'Libravatar Junio C Hamano1-3/+8
2010-10-26Merge branch 'kb/merge-recursive-rename-threshold'Libravatar Junio C Hamano1-6/+25
2010-10-26Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2010-10-25Fix copy-pasted comments related to tree diff handling.Libravatar Yann Dirson1-2/+2
2010-10-21diff: don't presume empty file when corresponding object is missingLibravatar Nicolas Pitre1-2/+6
2010-10-21diff: report bogus input to -C/-M/-BLibravatar Jeff King1-3/+3