summaryrefslogtreecommitdiffstats
path: root/diff.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2010-02-16Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano1-0/+2
2010-02-15diff: make sure --output=/bad/path is caughtLarry D'Anna1-0/+2
2010-01-18Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano1-0/+2
2010-01-18Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano1-0/+2
2010-01-18Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano1-0/+2
2010-01-10Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano1-0/+2
2009-12-30Merge branch 'maint-1.6.1' into maintJunio C Hamano1-0/+2
2009-12-30textconv: stop leaking file descriptorsJeff King1-0/+2
2009-12-16Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano1-1/+3
2009-12-16ignore unknown color configurationJeff King1-1/+3
2009-11-28Give the hunk comment its own colorBert Wesarg1-3/+40
2009-11-27emit_line(): don't emit an empty <SET><RESET> followed by a newlineJunio C Hamano1-6/+7
2009-11-16Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano1-8/+12
2009-11-15Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano1-145/+262
2009-11-15Merge branch 'js/maint-diff-color-words'Junio C Hamano1-8/+12
2009-10-31diff --color-words: bit of clean-upJunio C Hamano1-14/+12
2009-10-30Merge branch 'js/diff-verbose-submodule'Junio C Hamano1-0/+18
2009-10-30diff --color-words -U0: fix the location of hunk headersJohannes Schindelin1-0/+6
2009-10-19Add the --submodule option to the diff option familyJohannes Schindelin1-0/+18
2009-10-17Merge branch 'jc/maint-blank-at-eof'Junio C Hamano1-145/+262
2009-10-11diff.c: stylefixFelipe Contreras1-1/+1
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eofJunio C Hamano1-22/+47
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano1-14/+35
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano1-148/+148
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano1-42/+113
2009-09-15diff -B: colour whitespace errorsJunio C Hamano1-26/+49
2009-09-15diff.c: emit_add_line() takes only the rest of the lineJunio C Hamano1-7/+9
2009-09-15diff.c: split emit_line() from the first char and the rest of the lineJunio C Hamano1-7/+26
2009-09-14diff.c: shuffling code aroundJunio C Hamano1-125/+125
2009-09-14diff --whitespace: fix blank lines at endJunio C Hamano1-21/+53
2009-09-04diff --color: color blank-at-eofJunio C Hamano1-10/+27
2009-09-04diff --whitespace=warn/error: fix blank-at-eof checkJunio C Hamano1-16/+48
2009-09-04diff --whitespace=warn/error: obey blank-at-eofJunio C Hamano1-3/+7
2009-09-04diff.c: the builtin_diff() deals with only two-file comparisonJunio C Hamano1-23/+9
2009-08-31Style fixes, add a space after if/for/while.Brian Gianforcaro1-1/+1
2009-07-09Merge branch 'rs/grep-p'Junio C Hamano1-0/+1
2009-07-06Merge branch 'tr/die_errno'Junio C Hamano1-5/+5
2009-07-01userdiff: add xdiff_clear_find_func()René Scharfe1-0/+1
2009-06-27Use die_errno() instead of die() when checking syscallsThomas Rast1-3/+3
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast1-2/+2
2009-06-09Merge branch 'maint'Junio C Hamano1-0/+1
2009-06-08diff.c: plug a memory leak in an error pathJohannes Sixt1-0/+1
2009-05-31diff: generate pretty filenames in prep_temp_blob()David Aguilar1-1/+11
2009-05-25Merge branch 'ar/unlink-err' into maintJunio C Hamano1-1/+1
2009-05-25convert bare readlink to strbuf_readlinkJeff King1-7/+4
2009-05-18Merge branch 'ar/unlink-err'Junio C Hamano1-1/+1
2009-05-18Merge branch 'mh/diff-stat-color'Junio C Hamano1-8/+7
2009-05-03Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1Junio C Hamano1-1/+1
2009-05-03Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Junio C Hamano1-1/+9
2009-05-01Fix a bunch of pointer declarations (codestyle)Felipe Contreras1-2/+2