summaryrefslogtreecommitdiff
path: root/builtin/push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-25 21:00:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-03-25 21:00:41 (GMT)
commit55f6fbef3d3910fbc5de87f81e8e8e882d3d1d38 (patch)
tree02db41e2c308c62a2b8bcc01f1849fef08571214 /builtin/push.c
parent212ca64fb4a50178bf8a83c7b1bab15da5c9ab4c (diff)
parentc2aba155da10b8bc9f867d2f0ac0e63cc8dae1a4 (diff)
downloadgit-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 'builtin/push.c')
-rw-r--r--builtin/push.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/push.c b/builtin/push.c
index 42b129d..5e4a0e9 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -437,6 +437,8 @@ int cmd_push(int argc, const char **argv, const char *prefix)
OPT_BIT(0, "prune", &flags, N_("prune locally removed refs"),
TRANSPORT_PUSH_PRUNE),
OPT_BIT(0, "no-verify", &flags, N_("bypass pre-push hook"), TRANSPORT_PUSH_NO_HOOK),
+ OPT_BIT(0, "follow-tags", &flags, N_("push missing but relevant tags"),
+ TRANSPORT_PUSH_FOLLOW_TAGS),
OPT_END()
};