summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
2009-05-01Fix a bunch of pointer declarations (codestyle)Felipe Contreras-2/+2
2009-04-11Allow users to un-configure rename detectionLinus Torvalds-7/+10
2009-03-28Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'Junio C Hamano-1/+9
2009-03-26Merge branch 'js/maint-diff-temp-smudge'Junio C Hamano-3/+10
2009-03-22diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano-1/+9
2009-03-22Smudge the files fed to external diff and textconvJohannes Schindelin-3/+10
2009-03-11Merge branch 'jc/maint-1.6.0-keep-pack'Junio C Hamano-1/+1
2009-03-07Remove unused function scope local variablesBenjamin Kramer-3/+1
2009-03-05Merge branch 'al/ansi-color'Junio C Hamano-8/+8
2009-03-04Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-maskingKeith Cascio-7/+10
2009-02-28has_sha1_pack(): refactor "pretend these packs do not exist" interfaceJunio C Hamano-1/+1
2009-02-13Remove redundant bit clears from diff_setup()Keith Cascio-3/+0
2009-02-13Clean up use of ANSI color sequencesArjen Laarhoven-8/+8
2009-02-12Bugfix: GIT_EXTERNAL_DIFF with more than one changed filesNazri Ramliy-4/+4
2009-01-31Merge branch 'jc/maint-split-diff-metainfo'Junio C Hamano-66/+80
2009-01-31Merge branch 'jk/signal-cleanup'Junio C Hamano-52/+56
2009-01-27Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...Junio C Hamano-66/+80
2009-01-27diff.c: output correct index lines for a split diffJunio C Hamano-66/+80
2009-01-25Merge branch 'js/diff-color-words'Junio C Hamano-70/+155
2009-01-23Merge branch 'js/patience-diff'Junio C Hamano-0/+2
2009-01-21refactor signal handling for cleanup functionsJeff King-1/+1
2009-01-21chain kill signals for cleanup functionsJeff King-2/+3
2009-01-21diff: refactor tempfile cleanup handlingJeff King-52/+55
2009-01-21Merge branch 'maint'Junio C Hamano-1/+3
2009-01-21color-words: Support diff.wordregex config optionBoyd Stephen Smith Jr-0/+5
2009-01-21Rename diff.suppress-blank-empty to diff.suppressBlankEmptyJohannes Schindelin-1/+3
2009-01-17color-words: make regex configurable via attributesThomas Rast-0/+10
2009-01-17color-words: enable REG_NEWLINE to help userThomas Rast-1/+2
2009-01-17color-words: take an optional regular expression describing wordsJohannes Schindelin-9/+55
2009-01-17color-words: change algorithm to allow for 0-character word boundariesJohannes Schindelin-66/+91
2009-01-17color-words: refactor word splitting and use ALLOC_GROW()Johannes Schindelin-21/+19
2009-01-07Introduce the diff option '--patience'Johannes Schindelin-0/+2
2009-01-07Merge branch 'rs/diff-ihc'Junio C Hamano-0/+4
2009-01-05remove trailing LF in die() messagesAlexander Potashev-1/+1
2008-12-29diff: add option to show context between close hunksRené Scharfe-0/+4
2008-12-18Fix type-mismatch compiler warning from diff_populate_filespec()René Scharfe-1/+2
2008-12-17Make 'prepare_temp_file()' ignore st_size for symlinksLinus Torvalds-5/+4
2008-12-17Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'Linus Torvalds-9/+7
2008-12-09diff: respect textconv in rewrite diffsJeff King-12/+36
2008-12-09diff: fix handling of binary rewrite diffsJeff King-1/+3
2008-12-07diff: allow turning on textconv explicitly for plumbingJeff King-0/+4
2008-11-12Merge branch 'jk/diff-convfilter'Junio C Hamano-25/+45
2008-11-12Merge branch 'jk/diff-convfilter-test-fix'Junio C Hamano-1/+1
2008-11-08Merge branch 'rs/blame'Junio C Hamano-0/+5
2008-10-26only textconv regular filesJeff King-0/+2
2008-10-26userdiff: require explicitly allowing textconvJeff King-15/+11
2008-10-26refactor userdiff textconv codeJeff King-13/+35
2008-10-26diff: add missing static declarationJeff King-1/+1
2008-10-25Always initialize xpparam_t to 0Brian Downing-0/+5
2008-10-18diff: add filter for converting binary to textJeff King-2/+47