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 /revision.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 'revision.h')
-rw-r--r-- | revision.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -151,6 +151,7 @@ extern volatile show_early_output_fn_t show_early_output; struct setup_revision_opt { const char *def; void (*tweak)(struct rev_info *, struct setup_revision_opt *); + const char *submodule; }; extern void init_revisions(struct rev_info *revs, const char *prefix); |