diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-22 06:27:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-22 06:27:59 (GMT) |
| commit | 2d984464c6be7ced6772a8dcf95d6a461a659a78 (patch) | |
| tree | ebde8778f17609acc0587524636ec4862c065ca9 /submodule.h | |
| parent | d25c72f7da5116f7b7a1f88a59d2bc14415a03b2 (diff) | |
| parent | 68d03e4a6e448aa557f52adef92595ac4d6cd4bd (diff) | |
| download | git-2d984464c6be7ced6772a8dcf95d6a461a659a78.zip git-2d984464c6be7ced6772a8dcf95d6a461a659a78.tar.gz git-2d984464c6be7ced6772a8dcf95d6a461a659a78.tar.bz2 | |
Merge branch 'hv/submodule-find-ff-merge'
* hv/submodule-find-ff-merge:
Implement automatic fast-forward merge for submodules
setup_revisions(): Allow walking history in a submodule
Teach ref iteration module about submodules
Conflicts:
submodule.c
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/submodule.h b/submodule.h index 8ac4037..386f410 100644 --- a/submodule.h +++ b/submodule.h @@ -13,5 +13,7 @@ void show_submodule_summary(FILE *f, const char *path, unsigned dirty_submodule, const char *del, const char *add, const char *reset); unsigned is_submodule_modified(const char *path, int ignore_untracked); +int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20], + const unsigned char a[20], const unsigned char b[20]); #endif |