summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'np/types'Junio C Hamano2007-02-281-3/+4
|\
| * convert object type handling from a string to a numberNicolas Pitre2007-02-271-3/+4
* | diff --no-index: also imitate the exit status of diff(1)Johannes Schindelin2007-02-261-0/+6
* | Merge branch 'master' into js/diff-niJunio C Hamano2007-02-261-51/+100
|\ \ | |/
| * Merge branch 'maint'Junio C Hamano2007-02-241-2/+4
| |\
| | * diff-patch: Avoid emitting double-slashes in textual patch.Junio C Hamano2007-02-241-2/+4
| | |
| | \
| *-. \ Merge branches 'lt/crlf' and 'jc/apply-config'Junio C Hamano2007-02-221-1/+16
| |\ \ \ | | | |/
| | * | Lazy man's auto-CRLFLinus Torvalds2007-02-141-1/+16
| | |/
| * | Teach diff -B about coloursJohannes Schindelin2007-02-211-14/+25
| * | prefixcmp(): fix-up leftover strncmp().Junio C Hamano2007-02-201-1/+1
| * | Mechanical conversion to use prefixcmp()Junio C Hamano2007-02-201-15/+15
| * | Merge branch 'js/diff-color-check'Junio C Hamano2007-02-191-18/+39
| |\ \
| | * | diff --check: use colourJohannes Schindelin2007-02-181-18/+39
| | |/
* | | Teach git-diff-files the new option `--no-index`Johannes Schindelin2007-02-221-1/+2
|/ /
* | teach diff machinery about --ignore-space-at-eolJohannes Schindelin2007-02-131-0/+2
* | Merge branch 'jc/diff-apply-patch'Junio C Hamano2007-02-131-3/+17
|\ \ | |/ |/|
| * git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)Junio C Hamano2006-11-211-3/+17
* | Mark places that need blob munging later for CRLF conversion.Linus Torvalds2007-02-131-0/+1
* | diff.c: More logical file name quoting for renames in diffstat.Alexandre Julliard2007-02-111-7/+27
* | diff.c: Properly quote file names in diff --summary output.Alexandre Julliard2007-02-111-5/+12
* | diff.c: Reuse the pprint_rename function for diff --summary output.Alexandre Julliard2007-02-111-27/+4
* | diff_flush_name(): take struct diff_options parameter.Junio C Hamano2007-02-091-4/+4
* | short i/o: fix calls to write to use xwrite or write_in_fullAndy Whitcroft2007-01-081-1/+1
* | Merge branch 'sp/mmap'Junio C Hamano2007-01-071-3/+1
|\ \
| * | Replace mmap with xmmap, better handling MAP_FAILED.Shawn O. Pearce2006-12-291-3/+1
* | | diff-index --cached --raw: show tree entry on the LHS for unmerged entries.Junio C Hamano2007-01-061-2/+4
|/ /
* | Merge branch 'maint'Junio C Hamano2006-12-211-2/+2
|\ \
| * | diff --check: fix off by one errorJohannes Schindelin2006-12-211-2/+2
| |/
* | simplify inclusion of system header files.Junio C Hamano2006-12-201-3/+0
* | fix populate-filespecJunio C Hamano2006-12-191-1/+1
* | make commit message a little more consistent and confortingNicolas Pitre2006-12-151-1/+37
* | Avoid accessing a slow working copy during diffcore operations.Shawn O. Pearce2006-12-151-3/+21
* | Merge branch 'jc/numstat'Junio C Hamano2006-12-131-1/+4
|\ \
| * | diff --numstat: show binary with '-' to match "apply --numstat"Junio C Hamano2006-12-111-1/+4
| |/
* | Allow subcommand.color and color.subcommand color configurationAndy Parkins2006-12-131-2/+2
|/
* Merge branch 'js/diff'Junio C Hamano2006-10-181-0/+1
|\
| * Turn on recursive with --summaryJohannes Schindelin2006-10-051-0/+1
* | diff --numstatJunio C Hamano2006-10-131-2/+27
|/
* Merge branch 'jc/diff-stat'Junio C Hamano2006-09-301-41/+125
|\
| * diff --stat: ensure at least one '-' for deletions, and one '+' for additionsJohannes Schindelin2006-09-281-4/+7
| * diff --stat=width[,name-width]: allow custom diffstat output width.Linus Torvalds2006-09-281-8/+25
| * diff --stat: color output.Junio C Hamano2006-09-271-10/+19
| * diff --stat: allow custom diffstat output width.Junio C Hamano2006-09-271-38/+93
* | git-diff -B output fix.Junio C Hamano2006-09-291-1/+1
* | diff.c: second war on whitespace.Junio C Hamano2006-09-241-41/+131
|/
* Merge branch 'jk/diff'Junio C Hamano2006-09-171-132/+7
|\
| * Move color option parsing out of diff.c and into color.[ch]Jeff King2006-09-081-132/+4
| * diff: support custom callbacks for outputJeff King2006-09-071-0/+3
* | diff --binary generates full index on binary files.Junio C Hamano2006-09-071-1/+7
|/
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-021-2/+2
View Lorry Controller Status