summaryrefslogtreecommitdiff
path: root/diff-lib.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lt/gitlink'Junio C Hamano2007-04-211-12/+3
|\
| * diff-lib: use ce_mode_from_stat() rather than messing with modes manuallyLinus Torvalds2007-04-091-12/+3
* | Do not default to --no-index when given two directories.Junio C Hamano2007-04-131-10/+26
|/
* Teach --quiet to diff backends.Junio C Hamano2007-03-141-0/+6
* Allow git-diff exit with codes similar to diff(1)Alex Riesen2007-03-141-1/+4
* Merge branch 'js/diff-ni'Junio C Hamano2007-03-101-15/+27
|\
| * diff --no-index: support /dev/null as filenameJohannes Schindelin2007-03-041-17/+17
| * diff-ni: fix the diff with standard inputJunio C Hamano2007-03-041-5/+11
| * diff: support reading a file from stdin via "-"Johannes Schindelin2007-03-031-5/+11
* | Merge branch 'js/symlink'Junio C Hamano2007-03-041-0/+3
|\ \ | |/ |/|
| * Add core.symlinks to mark filesystems that do not support symbolic links.Johannes Sixt2007-03-021-0/+3
* | diff-ni: allow running from a subdirectory.Junio C Hamano2007-03-031-1/+13
* | diff: make more cases implicit --no-indexJohannes Schindelin2007-02-281-0/+54
|/
* diff --no-index: also imitate the exit status of diff(1)Johannes Schindelin2007-02-261-3/+8
* Merge branch 'master' into js/diff-niJunio C Hamano2007-02-261-3/+13
|\
| * diff --cc: fix display of symlink conflicts during a merge.Junio C Hamano2007-02-251-3/+13
* | Fix typo: do not show name1 when name2 failsJohannes Schindelin2007-02-251-1/+1
* | Evil Merge branch 'jc/status' (early part) into js/diff-niJunio C Hamano2007-02-241-9/+5
|\ \
| * | run_diff_{files,index}(): update calling convention.Junio C Hamano2007-02-221-9/+1
* | | Teach git-diff-files the new option `--no-index`Johannes Schindelin2007-02-221-0/+207
| |/ |/|
* | Do not take mode bits from index after type change.Junio C Hamano2007-02-161-3/+1
|/
* git-blame: no rev means start from the working tree file.Junio C Hamano2007-02-051-1/+43
* diff-index --cached --raw: show tree entry on the LHS for unmerged entries.Junio C Hamano2007-01-061-3/+6
* diff-index --cc shows a 3-way diff between HEAD, index and working tree.Paul Mackerras2006-09-051-0/+25
* Convert memset(hash,0,20) to hashclr(hash).Junio C Hamano2006-08-231-1/+1
* Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-231-2/+1
* Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes2006-08-171-1/+1
* Merge branch 'lt/objlist' into nextJunio C Hamano2006-06-191-2/+2
|\
| * Add "named object array" conceptLinus Torvalds2006-06-191-2/+2
* | Don't instantiate structures with FAMs.Florian Forster2006-06-181-19/+22
|/
* Libified diff-index: backward compatibility fix.Junio C Hamano2006-04-221-1/+9
* Libify diff-index.Junio C Hamano2006-04-221-0/+203
* Libify diff-files.Junio C Hamano2006-04-221-1762/+100
* diff --stat: do not drop rename information.Junio C Hamano2006-04-191-9/+68
* diff: move diff.c to diff-lib.c to make room.Junio C Hamano2006-04-191-0/+1736
View Lorry Controller Status