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

Merge lt/revlist,jc/diff,jc/revparse,jc/abbrev

Browse Source
This commit is contained in:
Junio C Hamano
2006-01-28 00:16:09 -08:00
parent 6b94f1e404 93b74bca86 ea726d02e9 b33aba5184 6b1ddbdd6e
commit addafaf92e
15 changed files with 936 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
diff.h
View File

@ -56,6 +56,19 @@ 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);
struct combine_diff_path {
struct combine_diff_path *next;
int len;
char *path;
unsigned char sha1[20];
unsigned char parent_sha1[FLEX_ARRAY][20];
};
int show_combined_diff(struct combine_diff_path *elem, int num_parent,
int dense, const char *header, int show_empty);
extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int, int);
extern void diff_addremove(struct diff_options *,
int addremove,
unsigned mode,
@ -88,9 +101,6 @@ extern int diff_setup_done(struct diff_options *);
#define DIFF_PICKAXE_ALL 1
#define DIFF_DEFAULT_INDEX_ABBREV 7 /* hex digits */
#define DIFF_DEFAULT_ABBREV 7 /* hex digits */
extern void diffcore_std(struct diff_options *);
extern void diffcore_std_no_resolve(struct diff_options *);