summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-24 09:22:04 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-28 08:08:28 (GMT)
commitd8f4790e6fe7a9d94468ea83d1370643604d43e5 (patch)
tree21468108c5791e31c898b5f49bdd7566f0975e48 /diff.h
parentaf3feefa1d057713c2277cc1543d438e60c65306 (diff)
downloadgit-d8f4790e6fe7a9d94468ea83d1370643604d43e5.zip
git-d8f4790e6fe7a9d94468ea83d1370643604d43e5.tar.gz
git-d8f4790e6fe7a9d94468ea83d1370643604d43e5.tar.bz2
diff-tree --cc: denser combined diff output for a merge commit.
Building on the previous '-c' (combined) option, '--cc' option squelches the output further by omitting hunks that consist of difference with solely one parent. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index 081234c..ab0d47b 100644
--- a/diff.h
+++ b/diff.h
@@ -56,7 +56,7 @@ extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
const char *base, struct diff_options *opt);
-extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int);
+extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int, int);
extern void diff_addremove(struct diff_options *,
int addremove,