summaryrefslogtreecommitdiff
path: root/builtin-diff.c
AgeCommit message (Collapse)Author
2006-05-18builtin-diff: do not say files are renamed when blob and file are givenJunio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-16builtin-diff: fix comparison between two blobs.Junio C Hamano
The code forgot that setup_revisions() leaves parsed object names in reverse in the list. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-07Sparse fix for builtin-diffPeter Hagervall
You gotta love sparse: builtin-diff.c:88:4: error: Just how const do you want this type to be? Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-04Merge branch 'jc/diff'Junio C Hamano
* jc/diff: builtin-diff: call it "git-diff", really. builtin-diff.c: die() formatting type fix. built-in diff: assorted updates. built-in diff.
2006-04-30builtin-diff.c: die() formatting type fix.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-29built-in diff: assorted updates.Junio C Hamano
"git diff(n)" without --base, --ours, etc. defaults to --cc, which usually is the same as -p unless you are in the middle of a conflicted merge, just like the shell script version. "git diff(n) blobA blobB path" complains and dies. "git diff(n) tree0 tree1 tree2...treeN" does combined diff that shows a merge of tree1..treeN to result in tree0. Giving "-c" option to any command that defaults to "--cc" turns off dense-combined flag. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-29built-in diff.Junio C Hamano
This starts to replace the shell script version of "git diff". Signed-off-by: Junio C Hamano <junkio@cox.net>