summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2009-02-13Remove redundant bit clears from diff_setup()Keith Cascio1-3/+0
2009-02-12Bugfix: GIT_EXTERNAL_DIFF with more than one changed filesNazri Ramliy1-4/+4
2009-01-31Merge branch 'jc/maint-split-diff-metainfo'Junio C Hamano1-66/+80
2009-01-31Merge branch 'jk/signal-cleanup'Junio C Hamano1-52/+56
2009-01-27Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...Junio C Hamano1-66/+80
2009-01-27diff.c: output correct index lines for a split diffJunio C Hamano1-66/+80
2009-01-25Merge branch 'js/diff-color-words'Junio C Hamano1-70/+155
2009-01-23Merge branch 'js/patience-diff'Junio C Hamano1-0/+2
2009-01-21refactor signal handling for cleanup functionsJeff King1-1/+1
2009-01-21chain kill signals for cleanup functionsJeff King1-2/+3
2009-01-21diff: refactor tempfile cleanup handlingJeff King1-52/+55
2009-01-21Merge branch 'maint'Junio C Hamano1-1/+3
2009-01-21color-words: Support diff.wordregex config optionBoyd Stephen Smith Jr1-0/+5
2009-01-21Rename diff.suppress-blank-empty to diff.suppressBlankEmptyJohannes Schindelin1-1/+3
2009-01-17color-words: make regex configurable via attributesThomas Rast1-0/+10
2009-01-17color-words: enable REG_NEWLINE to help userThomas Rast1-1/+2
2009-01-17color-words: take an optional regular expression describing wordsJohannes Schindelin1-9/+55
2009-01-17color-words: change algorithm to allow for 0-character word boundariesJohannes Schindelin1-66/+91
2009-01-17color-words: refactor word splitting and use ALLOC_GROW()Johannes Schindelin1-21/+19
2009-01-07Introduce the diff option '--patience'Johannes Schindelin1-0/+2
2009-01-07Merge branch 'rs/diff-ihc'Junio C Hamano1-0/+4
2009-01-05remove trailing LF in die() messagesAlexander Potashev1-1/+1
2008-12-29diff: add option to show context between close hunksRené Scharfe1-0/+4
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