diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-24 01:22:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-28 00:08:28 -0800 |
| commit | d8f4790e6fe7a9d94468ea83d1370643604d43e5 (patch) | |
| tree | 21468108c5791e31c898b5f49bdd7566f0975e48 /diff.h | |
| parent | af3feefa1d057713c2277cc1543d438e60c65306 (diff) | |
| download | git-d8f4790e6fe7a9d94468ea83d1370643604d43e5.tar.gz | |
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.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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, |