Code

built-in diff: assorted updates.
authorJunio C Hamano <junkio@cox.net>
Sat, 29 Apr 2006 08:24:49 +0000 (01:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 29 Apr 2006 08:32:53 +0000 (01:32 -0700)
commit0fe7c1de16f71312e6adac4b85bddf0d62a47168
tree099dbd7af41e8797655d227ba4cc5d639da18e67
parent65056021f2d2dcb7a72f05c5d6cbbd79a79b9d40
built-in diff: assorted updates.

"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>
builtin-diff.c
combine-diff.c
diff.h
revision.c