summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2008-12-18Fix type-mismatch compiler warning from diff_populate_filespec()René Scharfe1-1/+2
2008-12-17Make 'prepare_temp_file()' ignore st_size for symlinksLinus Torvalds1-5/+4
2008-12-17Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'Linus Torvalds1-9/+7
2008-12-09diff: respect textconv in rewrite diffsJeff King1-12/+36
2008-12-09diff: fix handling of binary rewrite diffsJeff King1-1/+3
2008-12-07diff: allow turning on textconv explicitly for plumbingJeff King1-0/+4
2008-11-12Merge branch 'jk/diff-convfilter'Junio C Hamano1-25/+45
2008-11-12Merge branch 'jk/diff-convfilter-test-fix'Junio C Hamano1-1/+1
2008-11-08Merge branch 'rs/blame'Junio C Hamano1-0/+5
2008-10-26only textconv regular filesJeff King1-0/+2
2008-10-26userdiff: require explicitly allowing textconvJeff King1-15/+11
2008-10-26refactor userdiff textconv codeJeff King1-13/+35
2008-10-26diff: add missing static declarationJeff King1-1/+1
2008-10-25Always initialize xpparam_t to 0Brian Downing1-0/+5
2008-10-18diff: add filter for converting binary to textJeff King1-2/+47
2008-10-18diff: introduce diff.<driver>.binaryJeff King1-30/+22
2008-10-18diff: unify external diff and funcname parsing codeJeff King1-224/+27
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey1-10/+5
2008-10-06Teach git diff about Objective-C syntaxJonathan del Strother1-0/+10
2008-10-06Merge branch 'maint'Shawn O. Pearce1-0/+4
2008-10-06fix bogus "diff --git" header from "diff --no-index"Linus Torvalds1-0/+4
2008-10-02fix openssl headers conflicting with custom SHA1 implementationsNicolas Pitre1-6/+6
2008-09-30diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785Brandon Casey1-2/+0
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce1-46/+60
2008-09-29Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce1-11/+1
2008-09-29Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce1-43/+55
2008-09-25Merge branch 'ho/dirstat-by-file'Shawn O. Pearce1-1/+9
2008-09-23t4018-diff-funcname: test syntax of builtin xfuncname patternsBrandon Casey1-1/+1
2008-09-20Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano1-1/+3
2008-09-20diff hunk pattern: fix misconverted "\{" tex macro introducersJunio C Hamano1-2/+2
2008-09-20diff: fix "multiple regexp" semantics to find hunk header commentJunio C Hamano1-1/+1
2008-09-19diff: use extended regexp to find hunk headersJunio C Hamano1-3/+3
2008-09-19Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano1-14/+17
2008-09-19diff: use extended regexp to find hunk headersJunio C Hamano1-14/+17
2008-09-18Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano1-39/+55
2008-09-18Merge branch 'jc/diff-prefix'Junio C Hamano1-6/+40
2008-09-18diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey1-0/+5
2008-09-18diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey1-9/+12
2008-09-18diff.c: return pattern entry pointer rather than just the hunk header patternBrandon Casey1-27/+28
2008-09-18Merge branch 'jc/maint-diff-quiet' into maintJunio C Hamano1-11/+1
2008-09-16Merge branch 'jc/maint-diff-quiet'Junio C Hamano1-11/+1
2008-09-10Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maintJunio C Hamano1-1/+8
2008-09-07Merge branch 'jc/hide-cr-in-diff-from-less'Junio C Hamano1-1/+8
2008-09-07Teach "git diff -p" to locate PHP class methodsAndreas Ericsson1-0/+1
2008-09-06diff --quiet: make it synonym to --exit-code >/dev/nullJunio C Hamano1-10/+0
2008-09-06diff Porcelain: do not disable auto index refreshing on -C -CJunio C Hamano1-1/+1
2008-09-05diff --dirstat-by-file: count changed files, not linesHeikki Orsila1-1/+9
2008-09-04Merge branch 'jc/maint-log-grep'Junio C Hamano1-3/+6
2008-09-03diff --cumulative is a sub-option of --dirstatJunio C Hamano1-3/+6
2008-08-30diff: vary default prefix depending on what are comparedJunio C Hamano1-6/+40