| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jc/maint-blank-at-eof' | Junio C Hamano | 2009-10-17 | 1 | -145/+262 |
|\ |
|
| * | Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eof | Junio C Hamano | 2009-09-15 | 1 | -22/+47 |
| |\ |
|
| | * | diff -B: colour whitespace errors | Junio C Hamano | 2009-09-15 | 1 | -26/+49 |
| * | | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a... | Junio C Hamano | 2009-09-15 | 1 | -14/+35 |
| |\ \
| | |/ |
|
| | * | diff.c: emit_add_line() takes only the rest of the line | Junio C Hamano | 2009-09-15 | 1 | -7/+9 |
| | * | diff.c: split emit_line() from the first char and the rest of the line | Junio C Hamano | 2009-09-15 | 1 | -7/+26 |
| * | | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a... | Junio C Hamano | 2009-09-15 | 1 | -148/+148 |
| |\ \
| | |/ |
|
| | * | diff.c: shuffling code around | Junio C Hamano | 2009-09-14 | 1 | -125/+125 |
| * | | Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a... | Junio C Hamano | 2009-09-15 | 1 | -42/+113 |
| |\ \
| | |/ |
|
| | * | diff --whitespace: fix blank lines at end | Junio C Hamano | 2009-09-14 | 1 | -21/+53 |
| | * | diff --color: color blank-at-eof | Junio C Hamano | 2009-09-04 | 1 | -10/+27 |
| | * | diff --whitespace=warn/error: fix blank-at-eof check | Junio C Hamano | 2009-09-04 | 1 | -16/+48 |
| | * | diff --whitespace=warn/error: obey blank-at-eof | Junio C Hamano | 2009-09-04 | 1 | -3/+7 |
| | * | diff.c: the builtin_diff() deals with only two-file comparison | Junio C Hamano | 2009-09-04 | 1 | -23/+9 |
* | | | diff.c: stylefix | Felipe Contreras | 2009-10-11 | 1 | -1/+1 |
* | | | Style fixes, add a space after if/for/while. | Brian Gianforcaro | 2009-08-31 | 1 | -1/+1 |
|/ / |
|
* | | Merge branch 'rs/grep-p' | Junio C Hamano | 2009-07-09 | 1 | -0/+1 |
|\ \ |
|
| * | | userdiff: add xdiff_clear_find_func() | René Scharfe | 2009-07-01 | 1 | -0/+1 |
* | | | Merge branch 'tr/die_errno' | Junio C Hamano | 2009-07-06 | 1 | -5/+5 |
|\ \ \
| |/ /
|/| | |
|
| * | | Use die_errno() instead of die() when checking syscalls | Thomas Rast | 2009-06-27 | 1 | -3/+3 |
| * | | Convert existing die(..., strerror(errno)) to die_errno() | Thomas Rast | 2009-06-27 | 1 | -2/+2 |
* | | | Merge branch 'maint' | Junio C Hamano | 2009-06-09 | 1 | -0/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | diff.c: plug a memory leak in an error path | Johannes Sixt | 2009-06-08 | 1 | -0/+1 |
| * | | Merge branch 'ar/unlink-err' into maint | Junio C Hamano | 2009-05-25 | 1 | -1/+1 |
| |\ \ |
|
* | | | | diff: generate pretty filenames in prep_temp_blob() | David Aguilar | 2009-05-31 | 1 | -1/+11 |
* | | | | convert bare readlink to strbuf_readlink | Jeff King | 2009-05-25 | 1 | -7/+4 |
* | | | | Merge branch 'ar/unlink-err' | Junio C Hamano | 2009-05-18 | 1 | -1/+1 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | replace direct calls to unlink(2) with unlink_or_warn | Alex Riesen | 2009-04-29 | 1 | -1/+1 |
* | | | | Merge branch 'mh/diff-stat-color' | Junio C Hamano | 2009-05-18 | 1 | -8/+7 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | diff: do not color --stat output like patch context | Markus Heidelberg | 2009-04-26 | 1 | -8/+7 |
| |/ / |
|
* | | | Fix a bunch of pointer declarations (codestyle) | Felipe Contreras | 2009-05-01 | 1 | -2/+2 |
|/ / |
|
* | | Allow users to un-configure rename detection | Linus Torvalds | 2009-04-11 | 1 | -7/+10 |
* | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' | Junio C Hamano | 2009-03-28 | 1 | -1/+9 |
|\ \ |
|
| * | | diff --cached: do not borrow from a work tree when a path is marked as assume... | Junio C Hamano | 2009-03-22 | 1 | -1/+9 |
* | | | Merge branch 'js/maint-diff-temp-smudge' | Junio C Hamano | 2009-03-26 | 1 | -3/+10 |
|\ \ \ |
|
| * | | | Smudge the files fed to external diff and textconv | Johannes Schindelin | 2009-03-22 | 1 | -3/+10 |
* | | | | Merge branch 'jc/maint-1.6.0-keep-pack' | Junio C Hamano | 2009-03-11 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | has_sha1_pack(): refactor "pretend these packs do not exist" interface | Junio C Hamano | 2009-02-28 | 1 | -1/+1 |
* | | | | | Remove unused function scope local variables | Benjamin Kramer | 2009-03-07 | 1 | -3/+1 |
* | | | | | Merge branch 'al/ansi-color' | Junio C Hamano | 2009-03-05 | 1 | -8/+8 |
|\ \ \ \ \ |
|
| * | | | | | Clean up use of ANSI color sequences | Arjen Laarhoven | 2009-02-13 | 1 | -8/+8 |
* | | | | | | Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking | Keith Cascio | 2009-03-04 | 1 | -7/+10 |
| |_|/ / /
|/| | | | |
|
* | | | | | Remove redundant bit clears from diff_setup() | Keith Cascio | 2009-02-13 | 1 | -3/+0 |
|/ / / / |
|
* | | | | Bugfix: GIT_EXTERNAL_DIFF with more than one changed files | Nazri Ramliy | 2009-02-12 | 1 | -4/+4 |
* | | | | Merge branch 'jc/maint-split-diff-metainfo' | Junio C Hamano | 2009-01-31 | 1 | -66/+80 |
|\ \ \ \ |
|
| * \ \ \ | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me... | Junio C Hamano | 2009-01-27 | 1 | -66/+80 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | * | | | diff.c: output correct index lines for a split diff | Junio C Hamano | 2009-01-27 | 1 | -66/+80 |
| | |/ / |
|
* | | | | Merge branch 'jk/signal-cleanup' | Junio C Hamano | 2009-01-31 | 1 | -52/+56 |
|\ \ \ \ |
|
| * | | | | refactor signal handling for cleanup functions | Jeff King | 2009-01-21 | 1 | -1/+1 |
| * | | | | chain kill signals for cleanup functions | Jeff King | 2009-01-21 | 1 | -2/+3 |