diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-25 21:00:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-25 21:00:41 (GMT) |
| commit | 55f6fbef3d3910fbc5de87f81e8e8e882d3d1d38 (patch) | |
| tree | 02db41e2c308c62a2b8bcc01f1849fef08571214 /commit.h | |
| parent | 212ca64fb4a50178bf8a83c7b1bab15da5c9ab4c (diff) | |
| parent | c2aba155da10b8bc9f867d2f0ac0e63cc8dae1a4 (diff) | |
| download | git-55f6fbef3d3910fbc5de87f81e8e8e882d3d1d38.zip git-55f6fbef3d3910fbc5de87f81e8e8e882d3d1d38.tar.gz git-55f6fbef3d3910fbc5de87f81e8e8e882d3d1d38.tar.bz2 | |
Merge branch 'jc/push-follow-tag'
The new "--follow-tags" option tells "git push" to push relevant
annotated tags when pushing branches out.
* jc/push-follow-tag:
push: --follow-tags
commit.c: use clear_commit_marks_many() in in_merge_bases_many()
commit.c: add in_merge_bases_many()
commit.c: add clear_commit_marks_many()
Diffstat (limited to 'commit.h')
| -rw-r--r-- | commit.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -137,6 +137,7 @@ struct commit *pop_most_recent_commit(struct commit_list **list, struct commit *pop_commit(struct commit_list **stack); void clear_commit_marks(struct commit *commit, unsigned int mark); +void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark); void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark); /* @@ -176,6 +177,7 @@ extern struct commit_list *get_shallow_commits(struct object_array *heads, int is_descendant_of(struct commit *, struct commit_list *); int in_merge_bases(struct commit *, struct commit *); +int in_merge_bases_many(struct commit *, int, struct commit **); extern int interactive_add(int argc, const char **argv, const char *prefix, int patch); extern int run_add_interactive(const char *revision, const char *patch_mode, |