summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
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
2010-08-03Merge branch 'sv/maint-diff-q-clear-fix' into maintJunio C Hamano-1/+0
2010-08-02Fix DIFF_QUEUE_CLEAR refactoringJunio C Hamano-1/+0
2010-07-08diff.c: fix a graph output bugBo Yang-2/+1
2010-06-30Merge branch 'jl/status-ignore-submodules'Junio C Hamano-11/+4
2010-06-30Merge branch 'jl/maint-diff-ignore-submodules'Junio C Hamano-1/+10
2010-06-27Merge branch 'ab/blame-textconv'Junio C Hamano-8/+4
2010-06-25Add the option "--ignore-submodules" to "git status"Jens Lehmann-11/+4
2010-06-22Merge branch 'maint'Junio C Hamano-1/+0
2010-06-22Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano-5/+16
2010-06-21Merge branch 'bw/diff-metainfo-color' into maintJunio C Hamano-26/+35
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano-5/+5
2010-06-18Merge branch 'cc/maint-diff-CC-binary'Junio C Hamano-5/+16
2010-06-18Merge branch 'by/diff-graph'Junio C Hamano-97/+312
2010-06-18Merge branch 'jh/diff-index-line-abbrev'Junio C Hamano-3/+3
2010-06-18Merge branch 'ec/diff-noprefix-config'Junio C Hamano-1/+8
2010-06-13Merge branch 'bw/diff-metainfo-color'Junio C Hamano-26/+35
2010-06-13Merge branch 'rs/diff-no-minimal'Junio C Hamano-5/+5
2010-06-11Add optional parameters to the diff option "--ignore-submodules"Jens Lehmann-1/+10
2010-06-11textconv: make the API publicAxel Bonnet-8/+4
2010-06-06diff: fix "git show -C -C" output when renaming a binary fileChristian Couder-6/+17
2010-05-31Make --color-words work well with --graphBo Yang-17/+104