summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2009-05-18Merge branch 'ar/unlink-err'Libravatar Junio C Hamano1-1/+1
2009-05-18Merge branch 'mh/diff-stat-color'Libravatar Junio C Hamano1-8/+7
2009-05-01Fix a bunch of pointer declarations (codestyle)Libravatar Felipe Contreras1-2/+2
2009-04-29replace direct calls to unlink(2) with unlink_or_warnLibravatar Alex Riesen1-1/+1
2009-04-26diff: do not color --stat output like patch contextLibravatar Markus Heidelberg1-8/+7
2009-04-11Allow users to un-configure rename detectionLibravatar Linus Torvalds1-7/+10
2009-03-28Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'Libravatar Junio C Hamano1-1/+9
2009-03-26Merge branch 'js/maint-diff-temp-smudge'Libravatar Junio C Hamano1-3/+10
2009-03-22diff --cached: do not borrow from a work tree when a path is marked as assume...Libravatar Junio C Hamano1-1/+9
2009-03-22Smudge the files fed to external diff and textconvLibravatar Johannes Schindelin1-3/+10
2009-03-11Merge branch 'jc/maint-1.6.0-keep-pack'Libravatar Junio C Hamano1-1/+1
2009-03-07Remove unused function scope local variablesLibravatar Benjamin Kramer1-3/+1
2009-03-05Merge branch 'al/ansi-color'Libravatar Junio C Hamano1-8/+8
2009-03-04Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-maskingLibravatar Keith Cascio1-7/+10
2009-02-28has_sha1_pack(): refactor "pretend these packs do not exist" interfaceLibravatar Junio C Hamano1-1/+1
2009-02-13Remove redundant bit clears from diff_setup()Libravatar Keith Cascio1-3/+0
2009-02-13Clean up use of ANSI color sequencesLibravatar Arjen Laarhoven1-8/+8
2009-02-12Bugfix: GIT_EXTERNAL_DIFF with more than one changed filesLibravatar Nazri Ramliy1-4/+4
2009-01-31Merge branch 'jc/maint-split-diff-metainfo'Libravatar Junio C Hamano1-66/+80
2009-01-31Merge branch 'jk/signal-cleanup'Libravatar Junio C Hamano1-52/+56
2009-01-27Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...Libravatar Junio C Hamano1-66/+80
2009-01-27diff.c: output correct index lines for a split diffLibravatar Junio C Hamano1-66/+80
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 21:33:34 +0000