summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2009-01-25Merge branch 'js/diff-color-words'Libravatar Junio C Hamano1-70/+155
2009-01-23Merge branch 'js/patience-diff'Libravatar Junio C Hamano1-0/+2
2009-01-21refactor signal handling for cleanup functionsLibravatar Jeff King1-1/+1
2009-01-21chain kill signals for cleanup functionsLibravatar Jeff King1-2/+3
2009-01-21diff: refactor tempfile cleanup handlingLibravatar Jeff King1-52/+55
2009-01-21Merge branch 'maint'Libravatar Junio C Hamano1-1/+3
2009-01-21color-words: Support diff.wordregex config optionLibravatar Boyd Stephen Smith Jr1-0/+5
2009-01-21Rename diff.suppress-blank-empty to diff.suppressBlankEmptyLibravatar Johannes Schindelin1-1/+3
2009-01-17color-words: make regex configurable via attributesLibravatar Thomas Rast1-0/+10
2009-01-17color-words: enable REG_NEWLINE to help userLibravatar Thomas Rast1-1/+2
2009-01-17color-words: take an optional regular expression describing wordsLibravatar Johannes Schindelin1-9/+55
2009-01-17color-words: change algorithm to allow for 0-character word boundariesLibravatar Johannes Schindelin1-66/+91
2009-01-17color-words: refactor word splitting and use ALLOC_GROW()Libravatar Johannes Schindelin1-21/+19
2009-01-07Introduce the diff option '--patience'Libravatar Johannes Schindelin1-0/+2
2009-01-07Merge branch 'rs/diff-ihc'Libravatar Junio C Hamano1-0/+4
2009-01-05remove trailing LF in die() messagesLibravatar Alexander Potashev1-1/+1
2008-12-29diff: add option to show context between close hunksLibravatar René Scharfe1-0/+4
2008-12-18Fix type-mismatch compiler warning from diff_populate_filespec()Libravatar René Scharfe1-1/+2
2008-12-17Make 'prepare_temp_file()' ignore st_size for symlinksLibravatar Linus Torvalds1-5/+4
2008-12-17Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'Libravatar Linus Torvalds1-9/+7
2008-12-09diff: respect textconv in rewrite diffsLibravatar Jeff King1-12/+36
2008-12-09diff: fix handling of binary rewrite diffsLibravatar Jeff King1-1/+3
2008-12-07diff: allow turning on textconv explicitly for plumbingLibravatar Jeff King1-0/+4
2008-11-12Merge branch 'jk/diff-convfilter'Libravatar Junio C Hamano1-25/+45
2008-11-12Merge branch 'jk/diff-convfilter-test-fix'Libravatar Junio C Hamano1-1/+1
2008-11-08Merge branch 'rs/blame'Libravatar Junio C Hamano1-0/+5
2008-10-26only textconv regular filesLibravatar Jeff King1-0/+2
2008-10-26userdiff: require explicitly allowing textconvLibravatar Jeff King1-15/+11
2008-10-26refactor userdiff textconv codeLibravatar Jeff King1-13/+35
2008-10-26diff: add missing static declarationLibravatar Jeff King1-1/+1
2008-10-25Always initialize xpparam_t to 0Libravatar Brian Downing1-0/+5
2008-10-18diff: add filter for converting binary to textLibravatar Jeff King1-2/+47
2008-10-18diff: introduce diff.<driver>.binaryLibravatar Jeff King1-30/+22
2008-10-18diff: unify external diff and funcname parsing codeLibravatar Jeff King1-224/+27
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerLibravatar Brandon Casey1-10/+5
2008-10-06Teach git diff about Objective-C syntaxLibravatar Jonathan del Strother1-0/+10
2008-10-06Merge branch 'maint'Libravatar Shawn O. Pearce1-0/+4
2008-10-06fix bogus "diff --git" header from "diff --no-index"Libravatar Linus Torvalds1-0/+4
2008-10-02fix openssl headers conflicting with custom SHA1 implementationsLibravatar Nicolas Pitre1-6/+6
2008-09-30diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785Libravatar Brandon Casey1-2/+0
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Libravatar Shawn O. Pearce1-46/+60
2008-09-29Merge branch 'maint' into bc/master-diff-hunk-header-fixLibravatar Shawn O. Pearce1-11/+1
2008-09-29Merge branch 'bc/maint-diff-hunk-header-fix' into maintLibravatar Shawn O. Pearce1-43/+55
2008-09-25Merge branch 'ho/dirstat-by-file'Libravatar Shawn O. Pearce1-1/+9
2008-09-23t4018-diff-funcname: test syntax of builtin xfuncname patternsLibravatar Brandon Casey1-1/+1
2008-09-20Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixLibravatar Junio C Hamano1-1/+3
2008-09-20diff hunk pattern: fix misconverted "\{" tex macro introducersLibravatar Junio C Hamano1-2/+2
2008-09-20diff: fix "multiple regexp" semantics to find hunk header commentLibravatar Junio C Hamano1-1/+1
2008-09-19diff: use extended regexp to find hunk headersLibravatar Junio C Hamano1-3/+3
2008-09-19Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixLibravatar Junio C Hamano1-14/+17