diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-29 01:24:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-29 01:32:53 -0700 |
| commit | 0fe7c1de16f71312e6adac4b85bddf0d62a47168 (patch) | |
| tree | 099dbd7af41e8797655d227ba4cc5d639da18e67 /diff.h | |
| parent | 65056021f2d2dcb7a72f05c5d6cbbd79a79b9d40 (diff) | |
| download | git-0fe7c1de16f71312e6adac4b85bddf0d62a47168.tar.gz git-0fe7c1de16f71312e6adac4b85bddf0d62a47168.tar.xz | |
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 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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 *, |