| Commit message (Expand) | Author | Age | Files | Lines |
* | remove ecb parameter from xdi_diff_outf() | René Scharfe | 2010-05-04 | 1 | -2/+1 |
* | combined diff: correctly handle truncated file | Thomas Rast | 2010-04-17 | 1 | -6/+8 |
* | Give the hunk comment its own color | Bert Wesarg | 2009-11-28 | 1 | -1/+4 |
* | Merge branch 'maint' | Junio C Hamano | 2009-07-22 | 1 | -15/+14 |
|\ |
|
| * | diff --cc: a lost line at the beginning of the file is shown incorrectly | Junio C Hamano | 2009-07-22 | 1 | -7/+9 |
| * | combine-diff.c: fix performance problem when folding common deleted lines | Junio C Hamano | 2009-07-22 | 1 | -8/+5 |
* | | Use die_errno() instead of die() when checking syscalls | Thomas Rast | 2009-06-27 | 1 | -1/+1 |
|/ |
|
* | Fix a bunch of pointer declarations (codestyle) | Felipe Contreras | 2009-05-01 | 1 | -2/+2 |
* | Merge branch 'maint' | Junio C Hamano | 2009-04-29 | 1 | -9/+25 |
|\ |
|
| * | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-29 | 1 | -12/+26 |
| |\ |
|
| | * | diff -c -p: do not die on submodules | Junio C Hamano | 2009-04-29 | 1 | -12/+26 |
* | | | Merge branch 'kb/checkout-optim' | Junio C Hamano | 2009-03-17 | 1 | -3/+1 |
|\ \ \ |
|
| * | | | show_patch_diff(): remove a call to fstat() | Kjetil Barvik | 2009-02-09 | 1 | -3/+1 |
| |/ / |
|
* | | | Move local variables to narrower scopes | Benjamin Kramer | 2009-03-07 | 1 | -2/+1 |
|/ / |
|
* | | combine-diff.c: use strbuf_readlink() | Junio C Hamano | 2008-12-17 | 1 | -5/+5 |
* | | Always initialize xpparam_t to 0 | Brian Downing | 2008-10-25 | 1 | -0/+1 |
* | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer | Brandon Casey | 2008-10-12 | 1 | -2/+1 |
* | | Merge branch 'jc/diff-prefix' | Junio C Hamano | 2008-09-18 | 1 | -2/+6 |
|\ \ |
|
| * | | diff: vary default prefix depending on what are compared | Junio C Hamano | 2008-08-30 | 1 | -2/+6 |
* | | | Merge branch 'jc/hide-cr-in-diff-from-less' | Junio C Hamano | 2008-09-07 | 1 | -2/+14 |
|\ \ \
| | |/
| |/| |
|
| * | | diff: Help "less" hide ^M from the output | Junio C Hamano | 2008-08-30 | 1 | -2/+14 |
| |/ |
|
* | | Merge branch 'maint' to sync with 1.6.0.1 | Junio C Hamano | 2008-08-24 | 1 | -0/+12 |
|\ \
| |/ |
|
| * | Respect core.autocrlf in combined diff | Alexander Gavrilov | 2008-08-23 | 1 | -0/+12 |
* | | xdiff-interface: hide the whole "xdiff_emit_state" business from the caller | Junio C Hamano | 2008-08-14 | 1 | -5/+2 |
* | | Make xdi_diff_outf interface for running xdiff_outf diffs | Brian Downing | 2008-08-13 | 1 | -3/+2 |
|/ |
|
* | Merge branch 'jc/maint-combine-diff-pre-context' | Junio C Hamano | 2008-06-22 | 1 | -2/+5 |
|\ |
|
| * | diff -c/--cc: do not include uninteresting deletion before leading context | Junio C Hamano | 2008-06-18 | 1 | -2/+5 |
* | | Cleanup xread() loops to use read_in_full() | Heikki Orsila | 2008-05-03 | 1 | -9/+8 |
* | | Remove dead code: show_log() sep argument and diff_options.msg_sep | Adam Simpkins | 2008-05-03 | 1 | -3/+3 |
* | | Die for an early EOF in a file reading loop | Heikki Orsila | 2008-04-27 | 1 | -3/+3 |
|/ |
|
* | Fix rewrite_diff() name quoting. | Junio C Hamano | 2007-12-26 | 1 | -10/+1 |
* | combine-diff: Fix path quoting | Junio C Hamano | 2007-12-26 | 1 | -10/+31 |
* | xdl_diff: identify call sites. | Junio C Hamano | 2007-12-13 | 1 | -1/+1 |
* | Make the diff_options bitfields be an unsigned with explicit masks. | Pierre Habouzit | 2007-11-11 | 1 | -5/+5 |
* | Full rework of quote_c_style and write_name_quoted. | Pierre Habouzit | 2007-09-20 | 1 | -14/+2 |
* | Future-proof source for changes in xdemitconf_t | Johannes Schindelin | 2007-07-06 | 1 | -2/+1 |
* | Ensure return value from xread() is always stored into an ssize_t | Johan Herland | 2007-05-15 | 1 | -1/+1 |
* | Support 'diff=pgm' attribute | Junio C Hamano | 2007-04-22 | 1 | -0/+1 |
* | Cast 64 bit off_t to 32 bit size_t | Shawn O. Pearce | 2007-03-07 | 1 | -2/+2 |
* | Tell multi-parent diff about core.symlinks. | Johannes Sixt | 2007-03-03 | 1 | -0/+10 |
* | convert object type handling from a string to a number | Nicolas Pitre | 2007-02-27 | 1 | -3/+3 |
* | diff --cc: integer overflow given a 2GB-or-larger file | Jim Meyering | 2007-02-27 | 1 | -3/+3 |
* | diff --cc: fix display of symlink conflicts during a merge. | Junio C Hamano | 2007-02-25 | 1 | -4/+21 |
* | combine-diff: special case --unified=0 | Junio C Hamano | 2007-02-03 | 1 | -4/+30 |
* | Merge branch 'jc/combined' | Junio C Hamano | 2006-10-26 | 1 | -4/+8 |
|\ |
|
| * | combine-diff: honour --no-commit-id | Junio C Hamano | 2006-10-26 | 1 | -3/+3 |
| * | combine-diff: fix hunk_comment_line logic. | Junio C Hamano | 2006-10-26 | 1 | -1/+5 |
* | | Merge branch 'jc/combined' | Junio C Hamano | 2006-10-26 | 1 | -5/+43 |
|\ \
| |/ |
|
| * | combine-diff: a few more finishing touches. | Junio C Hamano | 2006-10-26 | 1 | -5/+43 |
* | | diff --numstat | Junio C Hamano | 2006-10-13 | 1 | -3/+6 |
|/ |
|