summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2009-12-16Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano
2009-12-16ignore unknown color configurationJeff King
2009-11-28Give the hunk comment its own colorBert Wesarg
2009-11-28emit_line(): don't emit an empty <SET><RESET> followed by a newlineJunio C Hamano
2009-11-16Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano
2009-11-16Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano
2009-11-16Merge branch 'js/maint-diff-color-words'Junio C Hamano
2009-10-31diff --color-words: bit of clean-upJunio C Hamano
2009-10-31Merge branch 'js/diff-verbose-submodule'Junio C Hamano
2009-10-30diff --color-words -U0: fix the location of hunk headersJohannes Schindelin
2009-10-20Add the --submodule option to the diff option familyJohannes Schindelin
2009-10-17Merge branch 'jc/maint-blank-at-eof'Junio C Hamano
2009-10-12diff.c: stylefixFelipe Contreras
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eofJunio C Hamano
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano
2009-09-15diff -B: colour whitespace errorsJunio C Hamano
2009-09-15diff.c: emit_add_line() takes only the rest of the lineJunio C Hamano
2009-09-15diff.c: split emit_line() from the first char and the rest of the lineJunio C Hamano
2009-09-15diff.c: shuffling code aroundJunio C Hamano
2009-09-15diff --whitespace: fix blank lines at endJunio C Hamano
2009-09-04diff --color: color blank-at-eofJunio C Hamano
2009-09-04diff --whitespace=warn/error: fix blank-at-eof checkJunio C Hamano
2009-09-04diff --whitespace=warn/error: obey blank-at-eofJunio C Hamano
2009-09-04diff.c: the builtin_diff() deals with only two-file comparisonJunio C Hamano
2009-09-01Style fixes, add a space after if/for/while.Brian Gianforcaro
2009-07-09Merge branch 'rs/grep-p'Junio C Hamano
2009-07-06Merge branch 'tr/die_errno'Junio C Hamano
2009-07-02userdiff: add xdiff_clear_find_func()René Scharfe
2009-06-27Use die_errno() instead of die() when checking syscallsThomas Rast
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast
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