summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano2009-12-161-1/+3
|\
| * ignore unknown color configurationJeff King2009-12-161-1/+3
| * Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano2009-11-161-8/+12
| |\
| * \ Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano2009-11-151-145/+262
| |\ \
* | | | Give the hunk comment its own colorBert Wesarg2009-11-281-3/+40
* | | | emit_line(): don't emit an empty <SET><RESET> followed by a newlineJunio C Hamano2009-11-271-6/+7
* | | | Merge branch 'js/maint-diff-color-words'Junio C Hamano2009-11-151-8/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | diff --color-words: bit of clean-upJunio C Hamano2009-10-311-14/+12
| * | | diff --color-words -U0: fix the location of hunk headersJohannes Schindelin2009-10-301-0/+6
| |/ /
* | | Merge branch 'js/diff-verbose-submodule'Junio C Hamano2009-10-301-0/+18
|\ \ \
| * | | Add the --submodule option to the diff option familyJohannes Schindelin2009-10-191-0/+18
| |/ /
* | | Merge branch 'jc/maint-blank-at-eof'Junio C Hamano2009-10-171-145/+262
|\ \ \ | | |/ | |/|
| * | Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eofJunio C Hamano2009-09-151-22/+47
| |\ \
| | * | diff -B: colour whitespace errorsJunio C Hamano2009-09-151-26/+49
| * | | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-151-14/+35
| |\ \ \ | | |/ /
| | * | diff.c: emit_add_line() takes only the rest of the lineJunio C Hamano2009-09-151-7/+9
| | * | diff.c: split emit_line() from the first char and the rest of the lineJunio C Hamano2009-09-151-7/+26
| * | | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-151-148/+148
| |\ \ \ | | |/ /
| | * | diff.c: shuffling code aroundJunio C Hamano2009-09-141-125/+125
| * | | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-151-42/+113
| |\ \ \ | | |/ /
| | * | diff --whitespace: fix blank lines at endJunio C Hamano2009-09-141-21/+53
| | * | diff --color: color blank-at-eofJunio C Hamano2009-09-041-10/+27
| | * | diff --whitespace=warn/error: fix blank-at-eof checkJunio C Hamano2009-09-041-16/+48
| | * | diff --whitespace=warn/error: obey blank-at-eofJunio C Hamano2009-09-041-3/+7
| | * | diff.c: the builtin_diff() deals with only two-file comparisonJunio C Hamano2009-09-041-23/+9
* | | | diff.c: stylefixFelipe Contreras2009-10-111-1/+1
| |_|/ |/| |
* | | Style fixes, add a space after if/for/while.Brian Gianforcaro2009-08-311-1/+1
|/ /
* | Merge branch 'rs/grep-p'Junio C Hamano2009-07-091-0/+1
|\ \
| * | userdiff: add xdiff_clear_find_func()René Scharfe2009-07-011-0/+1
* | | Merge branch 'tr/die_errno'Junio C Hamano2009-07-061-5/+5
|\ \ \ | |/ / |/| |
| * | Use die_errno() instead of die() when checking syscallsThomas Rast2009-06-271-3/+3
| * | Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast2009-06-271-2/+2
* | | Merge branch 'maint'Junio C Hamano2009-06-091-0/+1
|\ \ \ | |/ / |/| |
| * | diff.c: plug a memory leak in an error pathJohannes Sixt2009-06-081-0/+1
| * | Merge branch 'ar/unlink-err' into maintJunio C Hamano2009-05-251-1/+1
| |\ \
* | | | diff: generate pretty filenames in prep_temp_blob()David Aguilar2009-05-311-1/+11
* | | | convert bare readlink to strbuf_readlinkJeff King2009-05-251-7/+4
* | | | Merge branch 'ar/unlink-err'Junio C Hamano2009-05-181-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | replace direct calls to unlink(2) with unlink_or_warnAlex Riesen2009-04-291-1/+1
* | | | Merge branch 'mh/diff-stat-color'Junio C Hamano2009-05-181-8/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | diff: do not color --stat output like patch contextMarkus Heidelberg2009-04-261-8/+7
| |/ /
* | | Fix a bunch of pointer declarations (codestyle)Felipe Contreras2009-05-011-2/+2
|/ /
* | Allow users to un-configure rename detectionLinus Torvalds2009-04-111-7/+10
* | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'Junio C Hamano2009-03-281-1/+9
|\ \
| * | diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano2009-03-221-1/+9
* | | Merge branch 'js/maint-diff-temp-smudge'Junio C Hamano2009-03-261-3/+10
|\ \ \
| * | | Smudge the files fed to external diff and textconvJohannes Schindelin2009-03-221-3/+10
* | | | Merge branch 'jc/maint-1.6.0-keep-pack'Junio C Hamano2009-03-111-1/+1
|\ \ \ \
| * | | | has_sha1_pack(): refactor "pretend these packs do not exist" interfaceJunio C Hamano2009-02-281-1/+1
* | | | | Remove unused function scope local variablesBenjamin Kramer2009-03-071-3/+1
View Lorry Controller Status