summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2009-07-02userdiff: add xdiff_clear_find_func()René Scharfe
2009-06-09Merge branch 'maint'Junio C Hamano
2009-06-09diff.c: plug a memory leak in an error pathJohannes Sixt
2009-06-01diff: generate pretty filenames in prep_temp_blob()David Aguilar
2009-05-26Merge branch 'ar/unlink-err' into maintJunio C Hamano
2009-05-25convert bare readlink to strbuf_readlinkJeff King
2009-05-18Merge branch 'ar/unlink-err'Junio C Hamano
2009-05-18Merge branch 'mh/diff-stat-color'Junio C Hamano
2009-05-01Fix a bunch of pointer declarations (codestyle)Felipe Contreras
2009-04-30replace direct calls to unlink(2) with unlink_or_warnAlex Riesen
2009-04-26diff: do not color --stat output like patch contextMarkus Heidelberg
2009-04-12Allow users to un-configure rename detectionLinus Torvalds
2009-03-28Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'Junio C Hamano
2009-03-26Merge branch 'js/maint-diff-temp-smudge'Junio C Hamano
2009-03-22diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano
2009-03-22Smudge the files fed to external diff and textconvJohannes Schindelin
2009-03-11Merge branch 'jc/maint-1.6.0-keep-pack'Junio C Hamano
2009-03-08Remove unused function scope local variablesBenjamin Kramer
2009-03-05Merge branch 'al/ansi-color'Junio C Hamano
2009-03-04Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-maskingKeith Cascio
2009-02-28has_sha1_pack(): refactor "pretend these packs do not exist" interfaceJunio C Hamano
2009-02-14Remove redundant bit clears from diff_setup()Keith Cascio
2009-02-14Clean up use of ANSI color sequencesArjen Laarhoven
2009-02-12Bugfix: GIT_EXTERNAL_DIFF with more than one changed filesNazri Ramliy
2009-02-01Merge branch 'jc/maint-split-diff-metainfo'Junio C Hamano
2009-02-01Merge branch 'jk/signal-cleanup'Junio C Hamano
2009-01-27Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...Junio C Hamano
2009-01-27diff.c: output correct index lines for a split diffJunio C Hamano
2009-01-26Merge branch 'js/diff-color-words'Junio C Hamano
2009-01-24Merge branch 'js/patience-diff'Junio C Hamano
2009-01-22refactor signal handling for cleanup functionsJeff King
2009-01-22chain kill signals for cleanup functionsJeff King
2009-01-22diff: refactor tempfile cleanup handlingJeff King
2009-01-21Merge branch 'maint'Junio C Hamano
2009-01-21color-words: Support diff.wordregex config optionBoyd Stephen Smith Jr
2009-01-21Rename diff.suppress-blank-empty to diff.suppressBlankEmptyJohannes Schindelin
2009-01-17color-words: make regex configurable via attributesThomas Rast
2009-01-17color-words: enable REG_NEWLINE to help userThomas Rast
2009-01-17color-words: take an optional regular expression describing wordsJohannes Schindelin
2009-01-17color-words: change algorithm to allow for 0-character word boundariesJohannes Schindelin
2009-01-17color-words: refactor word splitting and use ALLOC_GROW()Johannes Schindelin
2009-01-07Introduce the diff option '--patience'Johannes Schindelin
2009-01-07Merge branch 'rs/diff-ihc'Junio C Hamano
2009-01-05remove trailing LF in die() messagesAlexander Potashev
2008-12-29diff: add option to show context between close hunksRené Scharfe
2008-12-18Fix type-mismatch compiler warning from diff_populate_filespec()René Scharfe
2008-12-17Make 'prepare_temp_file()' ignore st_size for symlinksLinus Torvalds
2008-12-17Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'Linus Torvalds
2008-12-10diff: respect textconv in rewrite diffsJeff King
2008-12-10diff: fix handling of binary rewrite diffsJeff King