mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff-tree --cc: denser combined diff output for a merge commit.

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2006-01-24 01:22:04 -08:00
parent af3feefa1d
commit d8f4790e6f
3 changed files with 73 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff.h
View File

@ -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,