| commit | 0fe7c1de16f71312e6adac4b85bddf0d62a47168 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 29 Apr 2006 08:24:49 +0000 (29 01:24 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 29 Apr 2006 08:32:53 +0000 (29 01:32 -0700) | ||
| tree | 099dbd7af41e8797655d227ba4cc5d639da18e67 | treesnapshot (tar.gz zip) |
| parent | 65056021f2d2dcb7a72f05c5d6cbbd79a79b9d40 | commitdiff |
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>
"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 | diffblobblamehistory | |
| combine-diff.c | diffblobblamehistory | |
| diff.h | diffblobblamehistory | |
| revision.c | diffblobblamehistory |