summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-1.5.1' into maintJunio C Hamano2007-05-201-4/+2
|\
| * Use PATH_MAX instead of TEMPFILE_PATH_LENFernando J. Pereda2007-05-201-4/+2
* | Ensure return value from xread() is always stored into an ssize_tJohan Herland2007-05-151-1/+1
* | diff.c: do not use a separate "size cache".Junio C Hamano2007-05-071-68/+4
* | diff: release blobs after generating textual diff.Junio C Hamano2007-05-071-5/+17
* | Merge branch 'maint'Junio C Hamano2007-05-031-6/+7
|\ \ | |/
| * diff.c: fix "size cache" handling.Junio C Hamano2007-05-031-6/+7
* | Support 'diff=pgm' attributeJunio C Hamano2007-04-221-5/+82
* | Merge branch 'jc/attr'Junio C Hamano2007-04-211-11/+43
|\ \
| * | Simplify calling of CR/LF conversion routinesAlex Riesen2007-04-201-2/+2
| * | Fix funny types used in attribute value representationJunio C Hamano2007-04-181-2/+2
| * | Allow more than true/false to attributes.Junio C Hamano2007-04-171-3/+12
| * | Fix 'diff' attribute semantics.Junio C Hamano2007-04-151-2/+3
| * | Teach 'diff' about 'diff' attribute.Junio C Hamano2007-04-141-9/+31
* | | Expose subprojects as special files to "git diff" machineryLinus Torvalds2007-04-151-0/+20
|/ /
* | Show binary file size change in diff --statAndy Parkins2007-04-051-3/+10
|/
* diff --quietJunio C Hamano2007-03-141-2/+25
* Remove unused diffcore_std_no_resolveJunio C Hamano2007-03-141-11/+0
* Allow git-diff exit with codes similar to diff(1)Alex Riesen2007-03-141-0/+6
* Merge branch 'js/diff-ni'Junio C Hamano2007-03-101-0/+33
|\
| * diff-ni: fix the diff with standard inputJunio C Hamano2007-03-041-16/+29
| * diff: support reading a file from stdin via "-"Johannes Schindelin2007-03-031-0/+20
* | Cast 64 bit off_t to 32 bit size_tShawn O. Pearce2007-03-071-4/+5
|/
* 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
|\ \
View Lorry Controller Status