summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2009-11-15Merge branch 'js/maint-diff-color-words'Libravatar Junio C Hamano1-8/+12
2009-10-31diff --color-words: bit of clean-upLibravatar Junio C Hamano1-14/+12
2009-10-30Merge branch 'js/diff-verbose-submodule'Libravatar Junio C Hamano1-0/+18
2009-10-30diff --color-words -U0: fix the location of hunk headersLibravatar Johannes Schindelin1-0/+6
2009-10-19Add the --submodule option to the diff option familyLibravatar Johannes Schindelin1-0/+18
2009-10-17Merge branch 'jc/maint-blank-at-eof'Libravatar Junio C Hamano1-145/+262
2009-10-11diff.c: stylefixLibravatar Felipe Contreras1-1/+1
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eofLibravatar Junio C Hamano1-22/+47
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Libravatar Junio C Hamano1-14/+35
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Libravatar Junio C Hamano1-148/+148
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Libravatar Junio C Hamano1-42/+113
2009-09-15diff -B: colour whitespace errorsLibravatar Junio C Hamano1-26/+49
2009-09-15diff.c: emit_add_line() takes only the rest of the lineLibravatar Junio C Hamano1-7/+9
2009-09-15diff.c: split emit_line() from the first char and the rest of the lineLibravatar Junio C Hamano1-7/+26
2009-09-14diff.c: shuffling code aroundLibravatar Junio C Hamano1-125/+125
2009-09-14diff --whitespace: fix blank lines at endLibravatar Junio C Hamano1-21/+53
2009-09-04diff --color: color blank-at-eofLibravatar Junio C Hamano1-10/+27
2009-09-04diff --whitespace=warn/error: fix blank-at-eof checkLibravatar Junio C Hamano1-16/+48
2009-09-04diff --whitespace=warn/error: obey blank-at-eofLibravatar Junio C Hamano1-3/+7
2009-09-04diff.c: the builtin_diff() deals with only two-file comparisonLibravatar Junio C Hamano1-23/+9
2009-08-31Style fixes, add a space after if/for/while.Libravatar Brian Gianforcaro1-1/+1
2009-07-09Merge branch 'rs/grep-p'Libravatar Junio C Hamano1-0/+1
2009-07-06Merge branch 'tr/die_errno'Libravatar Junio C Hamano1-5/+5
2009-07-01userdiff: add xdiff_clear_find_func()Libravatar René Scharfe1-0/+1
2009-06-27Use die_errno() instead of die() when checking syscallsLibravatar Thomas Rast1-3/+3
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Libravatar Thomas Rast1-2/+2
2009-06-09Merge branch 'maint'Libravatar Junio C Hamano1-0/+1
2009-06-08diff.c: plug a memory leak in an error pathLibravatar Johannes Sixt1-0/+1
2009-05-31diff: generate pretty filenames in prep_temp_blob()Libravatar David Aguilar1-1/+11
2009-05-25Merge branch 'ar/unlink-err' into maintLibravatar Junio C Hamano1-1/+1
2009-05-25convert bare readlink to strbuf_readlinkLibravatar Jeff King1-7/+4
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