summaryrefslogtreecommitdiff
path: root/builtin-push.c
diff options
context:
space:
mode:
authorNanako Shiraishi <nanako3@lavabit.com>2009-10-19 03:57:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-10-19 05:47:48 (GMT)
commit8ef4c28b8d391ee053049d2dc9a3568b86c0dd38 (patch)
treeb1d58639efd8c1d8fc76dae017d8d22ead5271ed /builtin-push.c
parentfcb044ee5754ad2df2d217748a976ec82970eb29 (diff)
downloadgit-8ef4c28b8d391ee053049d2dc9a3568b86c0dd38.zip
git-8ef4c28b8d391ee053049d2dc9a3568b86c0dd38.tar.gz
git-8ef4c28b8d391ee053049d2dc9a3568b86c0dd38.tar.bz2
git push: say that --tag can't be used with --all or --mirror in help text
This replaces an earlier patch by Björn Gustavsson, Message-ID: <4AD75029.1010109@gmail.com> Signed-off-by: しらいし ななこ <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-push.c')
-rw-r--r--builtin-push.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-push.c b/builtin-push.c
index ab49b7c..b5cd2cd 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -181,7 +181,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
OPT_BIT( 0 , "all", &flags, "push all refs", TRANSPORT_PUSH_ALL),
OPT_BIT( 0 , "mirror", &flags, "mirror all refs",
(TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)),
- OPT_BOOLEAN( 0 , "tags", &tags, "push tags"),
+ OPT_BOOLEAN( 0 , "tags", &tags, "push tags (can't be used with --all or --mirror"),
OPT_BIT('n' , "dry-run", &flags, "dry run", TRANSPORT_PUSH_DRY_RUN),
OPT_BIT( 0, "porcelain", &flags, "machine-readable output", TRANSPORT_PUSH_PORCELAIN),
OPT_BIT('f', "force", &flags, "force updates", TRANSPORT_PUSH_FORCE),