summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
2011-03-22Remove unused variablesJohannes Schindelin-2/+1
2011-03-22Fix sparse warningsStephen Boyd-1/+1
2011-03-19Merge branch 'jk/merge-rename-ux'Junio C Hamano-1/+1
2011-03-16Merge branch 'jk/diffstat-binary' into maintJunio C Hamano-10/+21
2011-03-16standardize brace placement in struct definitionsJonathan Nieder-4/+2
2011-02-22diff: don't retrieve binary blobs for diffstatJeff King-4/+11
2011-02-22diff: handle diffstat of rewritten binary filesJeff King-10/+14
2011-02-21bump rename limit defaults (again)Jeff King-1/+1
2010-12-21Merge branch 'ks/blame-worktree-textconv-cached'Junio C Hamano-2/+2
2010-12-19fill_textconv(): Don't get/put cache if sha1 is not validKirill Smelkov-2/+2
2010-12-16Merge branch 'kb/diff-C-M-synonym'Junio C Hamano-8/+8
2010-12-10diff: use "find" instead of "detect" as prefix for long forms of -M and -CYann Dirson-9/+9
2010-12-09Merge branch 'np/diff-in-corrupt-repository' into maintJunio C Hamano-2/+6
2010-12-09Merge branch 'cm/diff-check-at-eol' into maintJunio C Hamano-1/+1
2010-12-08Merge branch 'jk/diff-CBM'Junio C Hamano-3/+3
2010-11-29Merge branch 'np/diff-in-corrupt-repository'Junio C Hamano-2/+6
2010-11-29Merge branch 'cm/diff-check-at-eol'Junio C Hamano-1/+1
2010-11-29diff: add --detect-copies-harder as a synonym for --find-copies-harderKevin Ballard-1/+1
2010-11-24Merge branch 'cb/diff-fname-optim' into maintJunio C Hamano-1/+1
2010-11-24Merge branch 'jk/no-textconv-symlink' into maintJunio C Hamano-3/+8
2010-11-17Merge branch 'cb/diff-fname-optim'Junio C Hamano-1/+1
2010-11-17Merge branch 'jk/no-textconv-symlink'Junio C Hamano-3/+8
2010-10-26Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano-6/+25
2010-10-26Merge branch 'maint'Junio C Hamano-2/+2
2010-10-25Fix copy-pasted comments related to tree diff handling.Yann Dirson-2/+2
2010-10-21diff: don't presume empty file when corresponding object is missingNicolas Pitre-2/+6
2010-10-21diff: report bogus input to -C/-M/-BJeff King-3/+3
2010-10-16diff --check: correct line numbers of new blank lines at EOFChristoph Mallon-1/+1
2010-09-29Merge branch 'jc/pickaxe-grep'Junio C Hamano-3/+8
2010-09-29diff: trivial fix for --output file error messageMatthieu Moy-1/+1
2010-09-29diff: add synonyms for -M, -C, -BKevin Ballard-3/+22
2010-09-29merge-recursive: option to specify rename thresholdKevin Ballard-3/+3
2010-09-23do not search functions for patch IDClemens Buchacher-1/+1
2010-09-23diff: don't use pathname-based diff drivers for symlinksJeff King-3/+8
2010-09-09Merge branch 'maint'Junio C Hamano-1/+4
2010-09-09diff.c: call regfree to free memory allocated by regcomp when necessaryBrandon Casey-1/+4
2010-08-31Merge branch 'cb/binary-patch-id'Junio C Hamano-0/+7
2010-08-31git log/diff: add -G<regexp> that greps in the patch textJunio C Hamano-2/+7
2010-08-31diff: pass the entire diff-options to diffcore_pickaxe()Junio C Hamano-1/+1
2010-08-21Merge branch 'mm/shortopt-detached'Junio C Hamano-43/+124
2010-08-18Merge branch 'jc/maint-follow-rename-fix'Junio C Hamano-14/+13
2010-08-18Merge branch 'jl/submodule-ignore-diff'Junio C Hamano-7/+34
2010-08-16hash binary sha1 into patch idClemens Buchacher-0/+7
2010-08-13diff --follow: do call diffcore_std() as necessaryJunio C Hamano-14/+13
2010-08-11diff: strip extra "/" when stripping prefixJakub Narebski-2/+8
2010-08-09Add the 'diff.ignoreSubmodules' config settingJohannes Schindelin-1/+5
2010-08-09Submodules: Add the new "ignore" config option for diff and statusJens Lehmann-6/+29
2010-08-06diff: parse separate options --stat-width n, --stat-name-width nMatthieu Moy-5/+23
2010-08-06diff: split off a function for --stat-* option parsingJonathan Nieder-27/+35
2010-08-06diff: parse separate options like -S fooMatthieu Moy-16/+71