diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-09 01:07:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-09 01:07:54 -0700 |
| commit | 3125be17d66e65c854249fb6a0c05322798593fe (patch) | |
| tree | bef05137065b4e424232c002be3f3e3bbbe8ba23 /builtin-push.c | |
| parent | 1d4bf0b362bbe26f6a8b6e8e278cd45986de4aeb (diff) | |
| parent | 1965ff744a7e4cdefcc467991182b779f3c9d0e8 (diff) | |
| download | git-3125be17d66e65c854249fb6a0c05322798593fe.tar.gz | |
Merge branch 'ld/push-porcelain-output-format'
* ld/push-porcelain-output-format:
add --porcelain option to git-push
Diffstat (limited to 'builtin-push.c')
| -rw-r--r-- | builtin-push.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-push.c b/builtin-push.c index 7be12399b6..0a0297f981 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -10,7 +10,7 @@ #include "parse-options.h" static const char * const push_usage[] = { - "git push [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=<repository>] [-f | --force] [-v] [<repository> <refspec>...]", + "git push [--all | --mirror] [--dry-run] [--porcelain] [--tags] [--receive-pack=<git-receive-pack>] [--repo=<repository>] [-f | --force] [-v] [<repository> <refspec>...]", NULL, }; @@ -200,6 +200,7 @@ int cmd_push(int argc, const char **argv, const char *prefix) (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)), OPT_BOOLEAN( 0 , "tags", &tags, "push tags"), OPT_BIT( 0 , "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), OPT_BOOLEAN( 0 , "thin", &thin, "use thin pack"), OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", "receive pack program"), |