| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix | Junio C Hamano | 2008-09-18 | 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 |
|/ |
|
* | Convert memcpy(a,b,20) to hashcpy(a,b). | Shawn Pearce | 2006-08-23 | 1 | -5/+5 |
* | Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length. | David Rientjes | 2006-08-17 | 1 | -2/+2 |
* | make inline is_null_sha1 global | David Rientjes | 2006-08-15 | 1 | -2/+2 |
* | Remove combine-diff.c::uninteresting() | Junio C Hamano | 2006-08-14 | 1 | -9/+2 |
* | Fix type of combine-diff.c::show_patch_diff() | Junio C Hamano | 2006-08-13 | 1 | -7/+5 |
* | combine-diff: use color | Junio C Hamano | 2006-08-10 | 1 | -16/+34 |
* | Substitute xmalloc()+memset(0) with xcalloc(). | Peter Eriksen | 2006-07-25 | 1 | -2/+1 |
* | Fix more typos, primarily in the code | Pavel Roskin | 2006-07-10 | 1 | -1/+1 |
* | Merge branch 'th/diff' | Junio C Hamano | 2006-07-05 | 1 | -34/+34 |
|\ |
|
| * | combine-diff.c: type sanity. | Junio C Hamano | 2006-06-28 | 1 | -1/+1 |
| * | Fix some more diff options changes. | Junio C Hamano | 2006-06-27 | 1 | -9/+15 |
| * | Add msg_sep to diff_options | Timo Hirvonen | 2006-06-26 | 1 | -3/+4 |
| * | Merge with_raw, with_stat and summary variables to output_format | Timo Hirvonen | 2006-06-26 | 1 | -31/+24 |
* | | combine-diff.c: type sanity | Junio C Hamano | 2006-06-28 | 1 | -14/+15 |
|/ |
|
* | git diff: support "-U" and "--unified" options properly | Linus Torvalds | 2006-05-14 | 1 | -0/+1 |
* | built-in diff: assorted updates. | Junio C Hamano | 2006-04-29 | 1 | -17/+30 |
* | Merge branch 'lt/logopt' | Junio C Hamano | 2006-04-18 | 1 | -35/+54 |
|\ |
|
| * | combine-diff: show diffstat with the first parent. | Junio C Hamano | 2006-04-17 | 1 | -5/+19 |
| * | Log message printout cleanups (#2) | Linus Torvalds | 2006-04-17 | 1 | -6/+16 |