aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-maskingKeith Cascio2009-03-04
* Remove redundant bit clears from diff_setup()Keith Cascio2009-02-13
* Bugfix: GIT_EXTERNAL_DIFF with more than one changed filesNazri Ramliy2009-02-12
* Merge branch 'jc/maint-split-diff-metainfo'Junio C Hamano2009-01-31
|\
| * Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...Junio C Hamano2009-01-27
| |\
| | * diff.c: output correct index lines for a split diffJunio C Hamano2009-01-27
* | | Merge branch 'jk/signal-cleanup'Junio C Hamano2009-01-31
|\ \ \
| * | | refactor signal handling for cleanup functionsJeff King2009-01-21
| * | | chain kill signals for cleanup functionsJeff King2009-01-21
| * | | diff: refactor tempfile cleanup handlingJeff King2009-01-21
* | | | Merge branch 'js/diff-color-words'Junio C Hamano2009-01-25
|\ \ \ \
| * | | | color-words: Support diff.wordregex config optionBoyd Stephen Smith Jr2009-01-21
| * | | | color-words: make regex configurable via attributesThomas Rast2009-01-17
| * | | | color-words: enable REG_NEWLINE to help userThomas Rast2009-01-17
| * | | | color-words: take an optional regular expression describing wordsJohannes Schindelin2009-01-17
| * | | | color-words: change algorithm to allow for 0-character word boundariesJohannes Schindelin2009-01-17
| * | | | color-words: refactor word splitting and use ALLOC_GROW()Johannes Schindelin2009-01-17
| |/ / /
* | | | Merge branch 'js/patience-diff'Junio C Hamano2009-01-23
|\ \ \ \
| * | | | Introduce the diff option '--patience'Johannes Schindelin2009-01-07
* | | | | Merge branch 'maint'Junio C Hamano2009-01-21
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Rename diff.suppress-blank-empty to diff.suppressBlankEmptyJohannes Schindelin2009-01-21
| |/ /
* | | Merge branch 'rs/diff-ihc'Junio C Hamano2009-01-07
|\ \ \
| * | | diff: add option to show context between close hunksRené Scharfe2008-12-29
| |/ /
* | | remove trailing LF in die() messagesAlexander Potashev2009-01-05
|/ /
* | Fix type-mismatch compiler warning from diff_populate_filespec()René Scharfe2008-12-18
* | Make 'prepare_temp_file()' ignore st_size for symlinksLinus Torvalds2008-12-17
* | Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'Linus Torvalds2008-12-17
* | diff: respect textconv in rewrite diffsJeff King2008-12-09
* | diff: fix handling of binary rewrite diffsJeff King2008-12-09
* | diff: allow turning on textconv explicitly for plumbingJeff King2008-12-07
* | Merge branch 'jk/diff-convfilter'Junio C Hamano2008-11-12
|\ \
| * | only textconv regular filesJeff King2008-10-26
| * | userdiff: require explicitly allowing textconvJeff King2008-10-26
| * | refactor userdiff textconv codeJeff King2008-10-26
* | | Merge branch 'jk/diff-convfilter-test-fix'Junio C Hamano2008-11-12
|\ \ \ | |/ /
| * | diff: add missing static declarationJeff King2008-10-26
* | | Merge branch 'rs/blame'Junio C Hamano2008-11-08
|\ \ \ | |/ / |/| |
| * | Always initialize xpparam_t to 0Brian Downing2008-10-25
* | | diff: add filter for converting binary to textJeff King2008-10-18
* | | diff: introduce diff.<driver>.binaryJeff King2008-10-18
* | | diff: unify external diff and funcname parsing codeJeff King2008-10-18
|/ /
* | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-12
* | Teach git diff about Objective-C syntaxJonathan del Strother2008-10-06
* | Merge branch 'maint'Shawn O. Pearce2008-10-06
|\ \ | |/
| * fix bogus "diff --git" header from "diff --no-index"Linus Torvalds2008-10-06
* | fix openssl headers conflicting with custom SHA1 implementationsNicolas Pitre2008-10-02
* | diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785Brandon Casey2008-09-30
* | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-29
|\ \
| * \ Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce2008-09-29
| |\ \ | | |/
| | * Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce2008-09-29
| | |\