summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
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
2010-10-16diff --check: correct line numbers of new blank lines at EOFLibravatar Christoph Mallon1-1/+1
2010-09-29Merge branch 'jc/pickaxe-grep'Libravatar Junio C Hamano1-3/+8
2010-09-29diff: trivial fix for --output file error messageLibravatar Matthieu Moy1-1/+1
2010-09-29diff: add synonyms for -M, -C, -BLibravatar Kevin Ballard1-3/+22
2010-09-29merge-recursive: option to specify rename thresholdLibravatar Kevin Ballard1-3/+3
2010-09-23do not search functions for patch IDLibravatar Clemens Buchacher1-1/+1
2010-09-23diff: don't use pathname-based diff drivers for symlinksLibravatar Jeff King1-3/+8
2010-09-09Merge branch 'maint'Libravatar Junio C Hamano1-1/+4
2010-09-09diff.c: call regfree to free memory allocated by regcomp when necessaryLibravatar Brandon Casey1-1/+4
2010-08-31Merge branch 'cb/binary-patch-id'Libravatar Junio C Hamano1-0/+7
2010-08-31git log/diff: add -G<regexp> that greps in the patch textLibravatar Junio C Hamano1-2/+7
2010-08-31diff: pass the entire diff-options to diffcore_pickaxe()Libravatar Junio C Hamano1-1/+1
2010-08-21Merge branch 'mm/shortopt-detached'Libravatar Junio C Hamano1-43/+124
2010-08-18Merge branch 'jc/maint-follow-rename-fix'Libravatar Junio C Hamano1-14/+13
2010-08-18Merge branch 'jl/submodule-ignore-diff'Libravatar Junio C Hamano1-7/+34
2010-08-16hash binary sha1 into patch idLibravatar Clemens Buchacher1-0/+7
2010-08-13diff --follow: do call diffcore_std() as necessaryLibravatar Junio C Hamano1-14/+13
2010-08-11diff: strip extra "/" when stripping prefixLibravatar Jakub Narebski1-2/+8
2010-08-09Add the 'diff.ignoreSubmodules' config settingLibravatar Johannes Schindelin1-1/+5
2010-08-09Submodules: Add the new "ignore" config option for diff and statusLibravatar Jens Lehmann1-6/+29
2010-08-06diff: parse separate options --stat-width n, --stat-name-width nLibravatar Matthieu Moy1-5/+23
2010-08-06diff: split off a function for --stat-* option parsingLibravatar Jonathan Nieder1-27/+35
2010-08-06diff: parse separate options like -S fooLibravatar Matthieu Moy1-16/+71
2010-08-03Merge branch 'sv/maint-diff-q-clear-fix' into maintLibravatar Junio C Hamano1-1/+0
2010-08-02Fix DIFF_QUEUE_CLEAR refactoringLibravatar Junio C Hamano1-1/+0
2010-07-08diff.c: fix a graph output bugLibravatar Bo Yang1-2/+1
2010-06-30Merge branch 'jl/status-ignore-submodules'Libravatar Junio C Hamano1-11/+4