summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2010-12-08Merge branch 'jk/diff-CBM'Junio C Hamano
2010-11-30Merge branch 'np/diff-in-corrupt-repository'Junio C Hamano
2010-11-30Merge branch 'cm/diff-check-at-eol'Junio C Hamano
2010-11-17Merge branch 'cb/diff-fname-optim'Junio C Hamano
2010-11-17Merge branch 'jk/no-textconv-symlink'Junio C Hamano
2010-10-27Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano
2010-10-26Merge branch 'maint'Junio C Hamano
2010-10-25Fix copy-pasted comments related to tree diff handling.Yann Dirson
2010-10-22diff: don't presume empty file when corresponding object is missingNicolas Pitre
2010-10-21diff: report bogus input to -C/-M/-BJeff King
2010-10-17diff --check: correct line numbers of new blank lines at EOFChristoph Mallon
2010-09-29Merge branch 'jc/pickaxe-grep'Junio C Hamano
2010-09-29diff: trivial fix for --output file error messageMatthieu Moy
2010-09-29diff: add synonyms for -M, -C, -BKevin Ballard
2010-09-29merge-recursive: option to specify rename thresholdKevin Ballard
2010-09-24do not search functions for patch IDClemens Buchacher
2010-09-24diff: don't use pathname-based diff drivers for symlinksJeff King
2010-09-10Merge branch 'maint'Junio C Hamano
2010-09-10diff.c: call regfree to free memory allocated by regcomp when necessaryBrandon Casey
2010-08-31Merge branch 'cb/binary-patch-id'Junio C Hamano
2010-08-31git log/diff: add -G<regexp> that greps in the patch textJunio C Hamano
2010-08-31diff: pass the entire diff-options to diffcore_pickaxe()Junio C Hamano
2010-08-22Merge branch 'mm/shortopt-detached'Junio C Hamano
2010-08-18Merge branch 'jc/maint-follow-rename-fix'Junio C Hamano
2010-08-18Merge branch 'jl/submodule-ignore-diff'Junio C Hamano
2010-08-17hash binary sha1 into patch idClemens Buchacher
2010-08-13diff --follow: do call diffcore_std() as necessaryJunio C Hamano
2010-08-11diff: strip extra "/" when stripping prefixJakub Narebski
2010-08-09Add the 'diff.ignoreSubmodules' config settingJohannes Schindelin
2010-08-09Submodules: Add the new "ignore" config option for diff and statusJens Lehmann
2010-08-06diff: parse separate options --stat-width n, --stat-name-width nMatthieu Moy
2010-08-06diff: split off a function for --stat-* option parsingJonathan Nieder
2010-08-06diff: parse separate options like -S fooMatthieu Moy
2010-08-03Merge branch 'sv/maint-diff-q-clear-fix' into maintJunio C Hamano
2010-08-02Fix DIFF_QUEUE_CLEAR refactoringJunio C Hamano
2010-07-09diff.c: fix a graph output bugBo Yang
2010-06-30Merge branch 'jl/status-ignore-submodules'Junio C Hamano
2010-06-30Merge branch 'jl/maint-diff-ignore-submodules'Junio C Hamano
2010-06-27Merge branch 'ab/blame-textconv'Junio C Hamano
2010-06-25Add the option "--ignore-submodules" to "git status"Jens Lehmann
2010-06-22Merge branch 'maint'Junio C Hamano
2010-06-22Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano
2010-06-21Merge branch 'bw/diff-metainfo-color' into maintJunio C Hamano
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano
2010-06-18Merge branch 'cc/maint-diff-CC-binary'Junio C Hamano
2010-06-18Merge branch 'by/diff-graph'Junio C Hamano
2010-06-18Merge branch 'jh/diff-index-line-abbrev'Junio C Hamano
2010-06-18Merge branch 'ec/diff-noprefix-config'Junio C Hamano
2010-06-13Merge branch 'bw/diff-metainfo-color'Junio C Hamano
2010-06-13Merge branch 'rs/diff-no-minimal'Junio C Hamano