diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-08 23:51:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-08 23:54:17 -0700 |
| commit | 58fe516bb51f09f372e7442933161c10b7ccddd8 (patch) | |
| tree | 074fd4a13ccb66298f1b5000859d7104110de409 /cache.h | |
| parent | 27be481ffbbde9499b4203d26680cf21b4a7ec29 (diff) | |
| parent | 68faf68938ee943fc251c702f2027e4dfda354db (diff) | |
| download | git-58fe516bb51f09f372e7442933161c10b7ccddd8.tar.xz | |
Merge branch 'jc/merge-subtree'
* jc/merge-subtree:
A new merge stragety 'subtree'.
It is safe to merge this early as this is a feature that user
explicitly needs to ask for and would not trigger otherwise. A
known issue with the current implementation is that the subtree
matching heuristics is very stupid. It could run ls-tree twice
and try to count intersection.
Giving it wider audience would help it to get improved by
motivated volunteers.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -496,4 +496,7 @@ extern void trace_argv_printf(const char **argv, int count, const char *format, extern int convert_to_git(const char *path, char **bufp, unsigned long *sizep); extern int convert_to_working_tree(const char *path, char **bufp, unsigned long *sizep); +/* match-trees.c */ +void shift_tree(const unsigned char *, const unsigned char *, unsigned char *, int); + #endif /* CACHE_H */ |