aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/maint-blank-at-eof'Junio C Hamano2009-10-17
|\
| * Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eofJunio C Hamano2009-09-15
| |\
| | * diff -B: colour whitespace errorsJunio C Hamano2009-09-15
| * | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-15
| |\ \ | | |/
| | * diff.c: emit_add_line() takes only the rest of the lineJunio C Hamano2009-09-15
| | * diff.c: split emit_line() from the first char and the rest of the lineJunio C Hamano2009-09-15
| * | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-15
| |\ \ | | |/
| | * diff.c: shuffling code aroundJunio C Hamano2009-09-14
| * | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-15
| |\ \ | | |/
| | * diff --whitespace: fix blank lines at endJunio C Hamano2009-09-14
| | * diff --color: color blank-at-eofJunio C Hamano2009-09-04
| | * diff --whitespace=warn/error: fix blank-at-eof checkJunio C Hamano2009-09-04
| | * diff --whitespace=warn/error: obey blank-at-eofJunio C Hamano2009-09-04
| | * diff.c: the builtin_diff() deals with only two-file comparisonJunio C Hamano2009-09-04
* | | diff.c: stylefixFelipe Contreras2009-10-11
* | | Style fixes, add a space after if/for/while.Brian Gianforcaro2009-08-31
|/ /
* | Merge branch 'rs/grep-p'Junio C Hamano2009-07-09
|\ \
| * | userdiff: add xdiff_clear_find_func()René Scharfe2009-07-01
* | | Merge branch 'tr/die_errno'Junio C Hamano2009-07-06
|\ \ \ | |/ / |/| |
| * | Use die_errno() instead of die() when checking syscallsThomas Rast2009-06-27
| * | Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast2009-06-27
* | | Merge branch 'maint'Junio C Hamano2009-06-09
|\ \ \ | |/ / |/| |
| * | diff.c: plug a memory leak in an error pathJohannes Sixt2009-06-08
| * | Merge branch 'ar/unlink-err' into maintJunio C Hamano2009-05-25
| |\ \
* | | | diff: generate pretty filenames in prep_temp_blob()David Aguilar2009-05-31
* | | | convert bare readlink to strbuf_readlinkJeff King2009-05-25
* | | | Merge branch 'ar/unlink-err'Junio C Hamano2009-05-18
|\ \ \ \ | | |/ / | |/| |
| * | | replace direct calls to unlink(2) with unlink_or_warnAlex Riesen2009-04-29
* | | | Merge branch 'mh/diff-stat-color'Junio C Hamano2009-05-18
|\ \ \ \ | |_|/ / |/| | |
| * | | diff: do not color --stat output like patch contextMarkus Heidelberg2009-04-26
| |/ /
* | | Fix a bunch of pointer declarations (codestyle)Felipe Contreras2009-05-01
|/ /
* | Allow users to un-configure rename detectionLinus Torvalds2009-04-11
* | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'Junio C Hamano2009-03-28
|\ \
| * | diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano2009-03-22
* | | Merge branch 'js/maint-diff-temp-smudge'Junio C Hamano2009-03-26
|\ \ \
| * | | Smudge the files fed to external diff and textconvJohannes Schindelin2009-03-22
* | | | Merge branch 'jc/maint-1.6.0-keep-pack'Junio C Hamano2009-03-11
|\ \ \ \
| * | | | has_sha1_pack(): refactor "pretend these packs do not exist" interfaceJunio C Hamano2009-02-28
* | | | | Remove unused function scope local variablesBenjamin Kramer2009-03-07
* | | | | Merge branch 'al/ansi-color'Junio C Hamano2009-03-05
|\ \ \ \ \
| * | | | | Clean up use of ANSI color sequencesArjen Laarhoven2009-02-13
* | | | | | Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-maskingKeith Cascio2009-03-04
| |_|/ / / |/| | | |
* | | | | Remove redundant bit clears from diff_setup()Keith Cascio2009-02-13
|/ / / /
* | | | Bugfix: GIT_EXTERNAL_DIFF with more than one changed filesNazri Ramliy2009-02-12
* | | | Merge branch 'jc/maint-split-diff-metainfo'Junio C Hamano2009-01-31
|\ \ \ \
| * \ \ \ Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...Junio C Hamano2009-01-27
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | diff.c: output correct index lines for a split diffJunio C Hamano2009-01-27
| | |/ /
* | | | Merge branch 'jk/signal-cleanup'Junio C Hamano2009-01-31
|\ \ \ \
| * | | | refactor signal handling for cleanup functionsJeff King2009-01-21
| * | | | chain kill signals for cleanup functionsJeff King2009-01-21
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-05 04:02:24 +0000