path: root/diff.h
diff options
authorJunio C Hamano <>2006-04-29 08:24:49 (GMT)
committerJunio C Hamano <>2006-04-29 08:32:53 (GMT)
commit0fe7c1de16f71312e6adac4b85bddf0d62a47168 (patch)
tree099dbd7af41e8797655d227ba4cc5d639da18e67 /diff.h
parent65056021f2d2dcb7a72f05c5d6cbbd79a79b9d40 (diff)
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 <>
Diffstat (limited to 'diff.h')
1 files changed, 2 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 7150b90..b3b2c4d 100644
--- a/diff.h
+++ b/diff.h
@@ -75,6 +75,8 @@ struct combine_diff_path {
extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
int dense, struct rev_info *);
+extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
extern void diff_addremove(struct diff_options *,