From: Nanako Shiraishi Date: Mon, 19 Oct 2009 03:57:01 +0000 (+0900) Subject: git push: say that --tag can't be used with --all or --mirror in help text X-Git-Tag: v1.6.5.2~14 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8ef4c28b8d391ee053049d2dc9a3568b86c0dd38;p=git.git 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: しらいし ななこ Signed-off-by: Junio C Hamano --- diff --git a/builtin-push.c b/builtin-push.c index ab49b7c76..b5cd2cdad 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),