aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* Merge branch 'js/diff-ni'Junio C Hamano2007-03-10
|\
| * diff-ni: fix the diff with standard inputJunio C Hamano2007-03-04
| * diff: support reading a file from stdin via "-"Johannes Schindelin2007-03-03
* | Cast 64 bit off_t to 32 bit size_tShawn O. Pearce2007-03-07
|/
* Merge branch 'np/types'Junio C Hamano2007-02-28
|\
| * convert object type handling from a string to a numberNicolas Pitre2007-02-27
* | diff --no-index: also imitate the exit status of diff(1)Johannes Schindelin2007-02-26
* | Merge branch 'master' into js/diff-niJunio C Hamano2007-02-26
|\ \ | |/
| * Merge branch 'maint'Junio C Hamano2007-02-24
| |\
| | * diff-patch: Avoid emitting double-slashes in textual patch.Junio C Hamano2007-02-24
| | |
| | \
| *-. \ Merge branches 'lt/crlf' and 'jc/apply-config'Junio C Hamano2007-02-22
| |\ \ \ | | | |/
| | * | Lazy man's auto-CRLFLinus Torvalds2007-02-14
| | |/
| * | Teach diff -B about coloursJohannes Schindelin2007-02-21
| * | prefixcmp(): fix-up leftover strncmp().Junio C Hamano2007-02-20
| * | Mechanical conversion to use prefixcmp()Junio C Hamano2007-02-20
| * | Merge branch 'js/diff-color-check'Junio C Hamano2007-02-19
| |\ \
| | * | diff --check: use colourJohannes Schindelin2007-02-18
| | |/
* | | Teach git-diff-files the new option `--no-index`Johannes Schindelin2007-02-22
|/ /
* | teach diff machinery about --ignore-space-at-eolJohannes Schindelin2007-02-13
* | Merge branch 'jc/diff-apply-patch'Junio C Hamano2007-02-13
|\ \ | |/ |/|
| * git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)Junio C Hamano2006-11-21
* | Mark places that need blob munging later for CRLF conversion.Linus Torvalds2007-02-13
* | diff.c: More logical file name quoting for renames in diffstat.Alexandre Julliard2007-02-11
* | diff.c: Properly quote file names in diff --summary output.Alexandre Julliard2007-02-11
* | diff.c: Reuse the pprint_rename function for diff --summary output.Alexandre Julliard2007-02-11
* | diff_flush_name(): take struct diff_options parameter.Junio C Hamano2007-02-09
* | short i/o: fix calls to write to use xwrite or write_in_fullAndy Whitcroft2007-01-08
* | Merge branch 'sp/mmap'Junio C Hamano2007-01-07
|\ \
| * | Replace mmap with xmmap, better handling MAP_FAILED.Shawn O. Pearce2006-12-29
* | | diff-index --cached --raw: show tree entry on the LHS for unmerged entries.Junio C Hamano2007-01-06
|/ /
* | Merge branch 'maint'Junio C Hamano2006-12-21
|\ \
| * | diff --check: fix off by one errorJohannes Schindelin2006-12-21
| |/
* | simplify inclusion of system header files.Junio C Hamano2006-12-20
* | fix populate-filespecJunio C Hamano2006-12-19
* | make commit message a little more consistent and confortingNicolas Pitre2006-12-15
* | Avoid accessing a slow working copy during diffcore operations.Shawn O. Pearce2006-12-15
* | Merge branch 'jc/numstat'Junio C Hamano2006-12-13
|\ \
| * | diff --numstat: show binary with '-' to match "apply --numstat"Junio C Hamano2006-12-11
| |/
* | Allow subcommand.color and color.subcommand color configurationAndy Parkins2006-12-13
|/
* Merge branch 'js/diff'Junio C Hamano2006-10-18
|\
| * Turn on recursive with --summaryJohannes Schindelin2006-10-05
* | diff --numstatJunio C Hamano2006-10-13
|/
* Merge branch 'jc/diff-stat'Junio C Hamano2006-09-30
|\
| * diff --stat: ensure at least one '-' for deletions, and one '+' for additionsJohannes Schindelin2006-09-28
| * diff --stat=width[,name-width]: allow custom diffstat output width.Linus Torvalds2006-09-28
| * diff --stat: color output.Junio C Hamano2006-09-27
| * diff --stat: allow custom diffstat output width.Junio C Hamano2006-09-27
* | git-diff -B output fix.Junio C Hamano2006-09-29
* | diff.c: second war on whitespace.Junio C Hamano2006-09-24
|/
* Merge branch 'jk/diff'Junio C Hamano2006-09-17
|\