summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano2010-01-181-0/+2
|\
| * Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2010-01-181-0/+2
| |\
| | * Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2010-01-101-0/+2
| | |\
| | | * textconv: stop leaking file descriptorsJeff King2009-12-301-0/+2
| | | * Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1Junio C Hamano2009-05-031-1/+1
| | | |\
| | | * \ Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Junio C Hamano2009-05-031-1/+9
| | | |\ \
| | * | \ \ Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maintJunio C Hamano2009-04-081-1/+9
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge branch 'jc/maint-1.6.0-keep-pack' into maintJunio C Hamano2009-04-081-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
* | | | | Merge branch 'al/ansi-color'Junio C Hamano2009-03-051-8/+8
|\ \ \ \ \
| * | | | | Clean up use of ANSI color sequencesArjen Laarhoven2009-02-131-8/+8
* | | | | | Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-maskingKeith Cascio2009-03-041-7/+10
| |_|/ / / |/| | | |
* | | | | Remove redundant bit clears from diff_setup()Keith Cascio2009-02-131-3/+0
|/ / / /
* | | | Bugfix: GIT_EXTERNAL_DIFF with more than one changed filesNazri Ramliy2009-02-121-4/+4
* | | | Merge branch 'jc/maint-split-diff-metainfo'Junio C Hamano2009-01-311-66/+80
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...Junio C Hamano2009-01-271-66/+80
| |\ \ \
| | * | | diff.c: output correct index lines for a split diffJunio C Hamano2009-01-271-66/+80
| | |/ /
* | | | Merge branch 'jk/signal-cleanup'Junio C Hamano2009-01-311-52/+56
|\ \ \ \
| * | | | refactor signal handling for cleanup functionsJeff King2009-01-211-1/+1
| * | | | chain kill signals for cleanup functionsJeff King2009-01-211-2/+3
| * | | | diff: refactor tempfile cleanup handlingJeff King2009-01-211-52/+55
* | | | | Merge branch 'js/diff-color-words'Junio C Hamano2009-01-251-70/+155
|\ \ \ \ \
| * | | | | color-words: Support diff.wordregex config optionBoyd Stephen Smith Jr2009-01-211-0/+5
| * | | | | color-words: make regex configurable via attributesThomas Rast2009-01-171-0/+10
| * | | | | color-words: enable REG_NEWLINE to help userThomas Rast2009-01-171-1/+2
| * | | | | color-words: take an optional regular expression describing wordsJohannes Schindelin2009-01-171-9/+55
| * | | | | color-words: change algorithm to allow for 0-character word boundariesJohannes Schindelin2009-01-171-66/+91
| * | | | | color-words: refactor word splitting and use ALLOC_GROW()Johannes Schindelin2009-01-171-21/+19
| |/ / / /