summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-29 08:24:49 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-29 08:32:53 (GMT)
commit0fe7c1de16f71312e6adac4b85bddf0d62a47168 (patch)
tree099dbd7af41e8797655d227ba4cc5d639da18e67 /revision.c
parent65056021f2d2dcb7a72f05c5d6cbbd79a79b9d40 (diff)
downloadgit-0fe7c1de16f71312e6adac4b85bddf0d62a47168.zip
git-0fe7c1de16f71312e6adac4b85bddf0d62a47168.tar.gz
git-0fe7c1de16f71312e6adac4b85bddf0d62a47168.tar.bz2
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>
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index f2a9f25..4381d45 100644
--- a/revision.c
+++ b/revision.c
@@ -664,6 +664,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
}
if (!strcmp(arg, "-c")) {
revs->diff = 1;
+ revs->dense_combined_merges = 0;
revs->combine_merges = 1;
continue;
}