summaryrefslogtreecommitdiff
path: root/builtin-diff.c
Commit message (Expand)AuthorAgeFilesLines
* Diff between two blobs should take mode changes into account now.Junio C Hamano2007-04-241-1/+1
* use mode of the tree in git-diff, if <tree>:<file> syntax is usedMartin Koegler2007-04-241-6/+14
* Support 'diff=pgm' attributeJunio C Hamano2007-04-221-0/+1
* Allow git-diff exit with codes similar to diff(1)Alex Riesen2007-03-141-8/+11
* diff: make more cases implicit --no-indexJohannes Schindelin2007-02-281-1/+4
* Merge branch 'master' into js/diff-niJunio C Hamano2007-02-261-1/+4
|\
| * diff --cached: give more sensible error message when HEAD is yet to be created.Junio C Hamano2007-02-251-0/+2
| * git-diff: fix combined diffJohannes Schindelin2007-02-221-1/+2
* | Evil Merge branch 'jc/status' (early part) into js/diff-niJunio C Hamano2007-02-241-0/+4
|\ \
| * | run_diff_{files,index}(): update calling convention.Junio C Hamano2007-02-221-0/+8
| |/
* | Teach git-diff-files the new option `--no-index`Johannes Schindelin2007-02-221-35/+3
|/
* Revert "git-diff: Introduce --index and deprecate --cached."Junio C Hamano2006-12-131-1/+1
* git-diff: Introduce --index and deprecate --cached.Andreas Ericsson2006-12-011-1/+1
* Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-231-2/+2
* Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes2006-08-171-1/+1
* make inline is_null_sha1 globalDavid Rientjes2006-08-151-2/+1
* Merge branch 'th/diff-extra'Junio C Hamano2006-08-121-7/+0
|\
| * Remove awkward compatibility wartsTimo Hirvonen2006-07-011-7/+0
* | Fix git-diff A...BJunio C Hamano2006-08-101-0/+1
* | check return value from diff_setup_done()Junio C Hamano2006-08-091-1/+2
* | Fixup command names in some usage strings.Ramsay Allan Jones2006-08-031-1/+1
* | Show both blob names from "git diff blob1 blob2"Junio C Hamano2006-08-031-1/+1
* | Fix "git diff blob1 blob2" showing the diff in reverse.Junio C Hamano2006-08-031-4/+1
* | Call setup_git_directory() much earlierLinus Torvalds2006-07-291-3/+2
* | Call setup_git_directory() earlyLinus Torvalds2006-07-281-3/+3
* | Merge branch 'jc/diff'Junio C Hamano2006-07-281-1/+9
|\ \
| * | git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"Junio C Hamano2006-07-171-1/+9
* | | log and diff family: honor config even from subdirectoriesJunio C Hamano2006-07-271-1/+2
|/ /
* | Remove TYPE_* constant macros and use object_type enums consistently.Linus Torvalds2006-07-121-3/+3
* | Fix more typos, primarily in the codePavel Roskin2006-07-101-1/+1
* | diff: do not use configuration magic at the core-levelJunio C Hamano2006-07-081-1/+1
|/
* builtin-diff: turn recursive on when defaulting to --patch format.Junio C Hamano2006-07-011-1/+3
* Set default diff output format after parsing command lineTimo Hirvonen2006-06-261-1/+3
* Make --raw option available for all diff commandsTimo Hirvonen2006-06-261-36/+12
* Merge with_raw, with_stat and summary variables to output_formatTimo Hirvonen2006-06-261-1/+1
* Add "named object array" conceptLinus Torvalds2006-06-191-12/+14
* Shrink "struct object" a bitLinus Torvalds2006-06-171-3/+3
* Merge branch 'master' into js/fmt-patchJunio C Hamano2006-05-211-6/+7
|\
| * builtin-diff: do not say files are renamed when blob and file are givenJunio C Hamano2006-05-181-1/+1
| * builtin-diff: fix comparison between two blobs.Junio C Hamano2006-05-151-3/+5
| * Sparse fix for builtin-diffPeter Hagervall2006-05-071-2/+1
* | fmt-patch: understand old <his> notationJohannes Schindelin2006-05-061-1/+1
|/
* Merge branch 'jc/diff'Junio C Hamano2006-05-031-2/+2
* builtin-diff.c: die() formatting type fix.Junio C Hamano2006-04-301-1/+1
* built-in diff: assorted updates.Junio C Hamano2006-04-291-9/+46
* built-in diff.Junio C Hamano2006-04-281-0/+332