| Commit message (Expand) | Author | Age | Files | Lines |
* | diff --quiet | Junio C Hamano | 2007-03-14 | 1 | -2/+25 |
* | Remove unused diffcore_std_no_resolve | Junio C Hamano | 2007-03-14 | 1 | -11/+0 |
* | Allow git-diff exit with codes similar to diff(1) | Alex Riesen | 2007-03-14 | 1 | -0/+6 |
* | Merge branch 'js/diff-ni' | Junio C Hamano | 2007-03-10 | 1 | -0/+33 |
|\ |
|
| * | diff-ni: fix the diff with standard input | Junio C Hamano | 2007-03-04 | 1 | -16/+29 |
| * | diff: support reading a file from stdin via "-" | Johannes Schindelin | 2007-03-03 | 1 | -0/+20 |
* | | Cast 64 bit off_t to 32 bit size_t | Shawn O. Pearce | 2007-03-07 | 1 | -4/+5 |
|/ |
|
* | Merge branch 'np/types' | Junio C Hamano | 2007-02-28 | 1 | -3/+4 |
|\ |
|
| * | convert object type handling from a string to a number | Nicolas Pitre | 2007-02-27 | 1 | -3/+4 |
* | | diff --no-index: also imitate the exit status of diff(1) | Johannes Schindelin | 2007-02-26 | 1 | -0/+6 |
* | | Merge branch 'master' into js/diff-ni | Junio C Hamano | 2007-02-26 | 1 | -51/+100 |
|\ \
| |/ |
|
| * | Merge branch 'maint' | Junio C Hamano | 2007-02-24 | 1 | -2/+4 |
| |\ |
|
| | * | diff-patch: Avoid emitting double-slashes in textual patch. | Junio C Hamano | 2007-02-24 | 1 | -2/+4 |
| | | | |
| | \ | |
| *-. \ | Merge branches 'lt/crlf' and 'jc/apply-config' | Junio C Hamano | 2007-02-22 | 1 | -1/+16 |
| |\ \ \
| | | |/ |
|
| | * | | Lazy man's auto-CRLF | Linus Torvalds | 2007-02-14 | 1 | -1/+16 |
| | |/ |
|
| * | | Teach diff -B about colours | Johannes Schindelin | 2007-02-21 | 1 | -14/+25 |
| * | | prefixcmp(): fix-up leftover strncmp(). | Junio C Hamano | 2007-02-20 | 1 | -1/+1 |
| * | | Mechanical conversion to use prefixcmp() | Junio C Hamano | 2007-02-20 | 1 | -15/+15 |
| * | | Merge branch 'js/diff-color-check' | Junio C Hamano | 2007-02-19 | 1 | -18/+39 |
| |\ \ |
|
| | * | | diff --check: use colour | Johannes Schindelin | 2007-02-18 | 1 | -18/+39 |
| | |/ |
|
* | | | Teach git-diff-files the new option `--no-index` | Johannes Schindelin | 2007-02-22 | 1 | -1/+2 |
|/ / |
|
* | | teach diff machinery about --ignore-space-at-eol | Johannes Schindelin | 2007-02-13 | 1 | -0/+2 |
* | | Merge branch 'jc/diff-apply-patch' | Junio C Hamano | 2007-02-13 | 1 | -3/+17 |
|\ \
| |/
|/| |
|
| * | git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2) | Junio C Hamano | 2006-11-21 | 1 | -3/+17 |
* | | Mark places that need blob munging later for CRLF conversion. | Linus Torvalds | 2007-02-13 | 1 | -0/+1 |
* | | diff.c: More logical file name quoting for renames in diffstat. | Alexandre Julliard | 2007-02-11 | 1 | -7/+27 |
* | | diff.c: Properly quote file names in diff --summary output. | Alexandre Julliard | 2007-02-11 | 1 | -5/+12 |
* | | diff.c: Reuse the pprint_rename function for diff --summary output. | Alexandre Julliard | 2007-02-11 | 1 | -27/+4 |
* | | diff_flush_name(): take struct diff_options parameter. | Junio C Hamano | 2007-02-09 | 1 | -4/+4 |
* | | short i/o: fix calls to write to use xwrite or write_in_full | Andy Whitcroft | 2007-01-08 | 1 | -1/+1 |
* | | Merge branch 'sp/mmap' | Junio C Hamano | 2007-01-07 | 1 | -3/+1 |
|\ \ |
|
| * | | Replace mmap with xmmap, better handling MAP_FAILED. | Shawn O. Pearce | 2006-12-29 | 1 | -3/+1 |
* | | | diff-index --cached --raw: show tree entry on the LHS for unmerged entries. | Junio C Hamano | 2007-01-06 | 1 | -2/+4 |
|/ / |
|
* | | Merge branch 'maint' | Junio C Hamano | 2006-12-21 | 1 | -2/+2 |
|\ \ |
|
| * | | diff --check: fix off by one error | Johannes Schindelin | 2006-12-21 | 1 | -2/+2 |
| |/ |
|
* | | simplify inclusion of system header files. | Junio C Hamano | 2006-12-20 | 1 | -3/+0 |
* | | fix populate-filespec | Junio C Hamano | 2006-12-19 | 1 | -1/+1 |
* | | make commit message a little more consistent and conforting | Nicolas Pitre | 2006-12-15 | 1 | -1/+37 |
* | | Avoid accessing a slow working copy during diffcore operations. | Shawn O. Pearce | 2006-12-15 | 1 | -3/+21 |
* | | Merge branch 'jc/numstat' | Junio C Hamano | 2006-12-13 | 1 | -1/+4 |
|\ \ |
|
| * | | diff --numstat: show binary with '-' to match "apply --numstat" | Junio C Hamano | 2006-12-11 | 1 | -1/+4 |
| |/ |
|
* | | Allow subcommand.color and color.subcommand color configuration | Andy Parkins | 2006-12-13 | 1 | -2/+2 |
|/ |
|
* | Merge branch 'js/diff' | Junio C Hamano | 2006-10-18 | 1 | -0/+1 |
|\ |
|
| * | Turn on recursive with --summary | Johannes Schindelin | 2006-10-05 | 1 | -0/+1 |
* | | diff --numstat | Junio C Hamano | 2006-10-13 | 1 | -2/+27 |
|/ |
|
* | Merge branch 'jc/diff-stat' | Junio C Hamano | 2006-09-30 | 1 | -41/+125 |
|\ |
|
| * | diff --stat: ensure at least one '-' for deletions, and one '+' for additions | Johannes Schindelin | 2006-09-28 | 1 | -4/+7 |
| * | diff --stat=width[,name-width]: allow custom diffstat output width. | Linus Torvalds | 2006-09-28 | 1 | -8/+25 |
| * | diff --stat: color output. | Junio C Hamano | 2006-09-27 | 1 | -10/+19 |
| * | diff --stat: allow custom diffstat output width. | Junio C Hamano | 2006-09-27 | 1 | -38/+93 |