summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/diff-ihc'Junio C Hamano2009-01-071-0/+4
|\
| * diff: add option to show context between close hunksRené Scharfe2008-12-291-0/+4
* | remove trailing LF in die() messagesAlexander Potashev2009-01-051-1/+1
|/
* Fix type-mismatch compiler warning from diff_populate_filespec()René Scharfe2008-12-181-1/+2
* Make 'prepare_temp_file()' ignore st_size for symlinksLinus Torvalds2008-12-171-5/+4
* Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'Linus Torvalds2008-12-171-9/+7
* diff: respect textconv in rewrite diffsJeff King2008-12-091-12/+36
* diff: fix handling of binary rewrite diffsJeff King2008-12-091-1/+3
* diff: allow turning on textconv explicitly for plumbingJeff King2008-12-071-0/+4
* Merge branch 'jk/diff-convfilter'Junio C Hamano2008-11-121-25/+45
|\
| * only textconv regular filesJeff King2008-10-261-0/+2
| * userdiff: require explicitly allowing textconvJeff King2008-10-261-15/+11
| * refactor userdiff textconv codeJeff King2008-10-261-13/+35
* | Merge branch 'jk/diff-convfilter-test-fix'Junio C Hamano2008-11-121-1/+1
|\ \ | |/
| * diff: add missing static declarationJeff King2008-10-261-1/+1
* | Merge branch 'rs/blame'Junio C Hamano2008-11-081-0/+5
|\ \ | |/ |/|
| * Always initialize xpparam_t to 0Brian Downing2008-10-251-0/+5
* | diff: add filter for converting binary to textJeff King2008-10-181-2/+47
* | diff: introduce diff.<driver>.binaryJeff King2008-10-181-30/+22
* | diff: unify external diff and funcname parsing codeJeff King2008-10-181-224/+27
|/
* Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-121-10/+5
* Teach git diff about Objective-C syntaxJonathan del Strother2008-10-061-0/+10
* Merge branch 'maint'Shawn O. Pearce2008-10-061-0/+4
|\
| * fix bogus "diff --git" header from "diff --no-index"Linus Torvalds2008-10-061-0/+4
* | fix openssl headers conflicting with custom SHA1 implementationsNicolas Pitre2008-10-021-6/+6
* | diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785Brandon Casey2008-09-301-2/+0
* | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-291-46/+60
|\ \
| * \ Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce2008-09-291-11/+1
| |\ \ | | |/
| | * Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce2008-09-291-43/+55
| | |\
| | * \ Merge branch 'jc/maint-diff-quiet' into maintJunio C Hamano2008-09-181-11/+1
| | |\ \
| * | | | t4018-diff-funcname: test syntax of builtin xfuncname patternsBrandon Casey2008-09-231-1/+1
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-201-1/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | diff hunk pattern: fix misconverted "\{" tex macro introducersJunio C Hamano2008-09-201-2/+2
| * | | | diff: fix "multiple regexp" semantics to find hunk header commentJunio C Hamano2008-09-201-1/+1
| * | | | diff: use extended regexp to find hunk headersJunio C Hamano2008-09-191-3/+3
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-191-14/+17
| |\ \ \ \ | | |/ / /
| | * | | diff: use extended regexp to find hunk headersJunio C Hamano2008-09-191-14/+17
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-181-39/+55
| |\ \ \ \ | | |/ / /
| | * | | diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey2008-09-181-0/+5
| | * | | diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey2008-09-181-9/+12
| | * | | diff.c: return pattern entry pointer rather than just the hunk header patternBrandon Casey2008-09-181-27/+28
| | |/ /
| | * | Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maintJunio C Hamano2008-09-101-1/+8
| | |\ \
* | | \ \ Merge branch 'ho/dirstat-by-file'Shawn O. Pearce2008-09-251-1/+9
|\ \ \ \ \
| * | | | | diff --dirstat-by-file: count changed files, not linesHeikki Orsila2008-09-051-1/+9
* | | | | | Merge branch 'jc/diff-prefix'Junio C Hamano2008-09-181-6/+40
|\ \ \ \ \ \
| * | | | | | diff: vary default prefix depending on what are comparedJunio C Hamano2008-08-301-6/+40
* | | | | | | Merge branch 'jc/maint-diff-quiet'Junio C Hamano2008-09-161-11/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | diff --quiet: make it synonym to --exit-code >/dev/nullJunio C Hamano2008-09-061-10/+0
| * | | | | | diff Porcelain: do not disable auto index refreshing on -C -CJunio C Hamano2008-09-061-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jc/hide-cr-in-diff-from-less'Junio C Hamano2008-09-071-1/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
View Lorry Controller Status