summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2009-01-07Merge branch 'rs/diff-ihc'Junio C Hamano
2009-01-05remove trailing LF in die() messagesAlexander Potashev
2008-12-29diff: add option to show context between close hunksRené Scharfe
2008-12-18Fix type-mismatch compiler warning from diff_populate_filespec()René Scharfe
2008-12-17Make 'prepare_temp_file()' ignore st_size for symlinksLinus Torvalds
2008-12-17Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'Linus Torvalds
2008-12-10diff: respect textconv in rewrite diffsJeff King
2008-12-10diff: fix handling of binary rewrite diffsJeff King
2008-12-08diff: allow turning on textconv explicitly for plumbingJeff King
2008-11-13Merge branch 'jk/diff-convfilter'Junio C Hamano
2008-11-13Merge branch 'jk/diff-convfilter-test-fix'Junio C Hamano
2008-11-09Merge branch 'rs/blame'Junio C Hamano
2008-10-26only textconv regular filesJeff King
2008-10-26userdiff: require explicitly allowing textconvJeff King
2008-10-26refactor userdiff textconv codeJeff King
2008-10-26diff: add missing static declarationJeff King
2008-10-25Always initialize xpparam_t to 0Brian Downing
2008-10-18diff: add filter for converting binary to textJeff King
2008-10-18diff: introduce diff.<driver>.binaryJeff King
2008-10-18diff: unify external diff and funcname parsing codeJeff King
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey
2008-10-06Teach git diff about Objective-C syntaxJonathan del Strother
2008-10-06Merge branch 'maint'Shawn O. Pearce
2008-10-06fix bogus "diff --git" header from "diff --no-index"Linus Torvalds
2008-10-03fix openssl headers conflicting with custom SHA1 implementationsNicolas Pitre
2008-09-30diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785Brandon Casey
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce
2008-09-29Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce
2008-09-29Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce
2008-09-25Merge branch 'ho/dirstat-by-file'Shawn O. Pearce
2008-09-23t4018-diff-funcname: test syntax of builtin xfuncname patternsBrandon Casey
2008-09-21Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano
2008-09-20diff hunk pattern: fix misconverted "\{" tex macro introducersJunio C Hamano
2008-09-20diff: fix "multiple regexp" semantics to find hunk header commentJunio C Hamano
2008-09-20diff: use extended regexp to find hunk headersJunio C Hamano
2008-09-20Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano
2008-09-20diff: use extended regexp to find hunk headersJunio C Hamano
2008-09-19Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano
2008-09-19Merge branch 'jc/diff-prefix'Junio C Hamano
2008-09-19diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey
2008-09-19diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey
2008-09-19diff.c: return pattern entry pointer rather than just the hunk header patternBrandon Casey
2008-09-19Merge branch 'jc/maint-diff-quiet' into maintJunio C Hamano
2008-09-16Merge branch 'jc/maint-diff-quiet'Junio C Hamano
2008-09-10Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maintJunio C Hamano
2008-09-08Merge branch 'jc/hide-cr-in-diff-from-less'Junio C Hamano
2008-09-07Teach "git diff -p" to locate PHP class methodsAndreas Ericsson
2008-09-07diff --quiet: make it synonym to --exit-code >/dev/nullJunio C Hamano
2008-09-07diff Porcelain: do not disable auto index refreshing on -C -CJunio C Hamano
2008-09-05diff --dirstat-by-file: count changed files, not linesHeikki Orsila