summaryrefslogtreecommitdiffstats
path: root/transport.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-25 22:00:40 +0100
committerJunio C Hamano <gitster@pobox.com>2013-03-25 22:00:41 +0100
commit55f6fbef3d3910fbc5de87f81e8e8e882d3d1d38 (patch)
tree02db41e2c308c62a2b8bcc01f1849fef08571214 /transport.h
parentMerge branch 'jc/maint-reflog-expire-clean-mark-typofix' (diff)
parentpush: --follow-tags (diff)
downloadgit-55f6fbef3d3910fbc5de87f81e8e8e882d3d1d38.tar.xz
git-55f6fbef3d3910fbc5de87f81e8e8e882d3d1d38.zip
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 'transport.h')
-rw-r--r--transport.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/transport.h b/transport.h
index a3450e97c0..9354462708 100644
--- a/transport.h
+++ b/transport.h
@@ -105,6 +105,7 @@ struct transport {
#define TRANSPORT_PUSH_PRUNE 128
#define TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND 256
#define TRANSPORT_PUSH_NO_HOOK 512
+#define TRANSPORT_PUSH_FOLLOW_TAGS 1024
#define TRANSPORT_SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
#define TRANSPORT_SUMMARY(x) (int)(TRANSPORT_SUMMARY_WIDTH + strlen(x) - gettext_width(x)), (x)