X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-push.c;h=787011f928556972b287ca5621a5d462cd6e2543;hb=511a3fc116799df5e3b2262f8f6e501ca73ba2fe;hp=50328f4b08e6fc69bb80a9649df2065efb0a9b2c;hpb=07436e43daf1a97d3d702090d6289f745bd5ad90;p=git.git diff --git a/builtin-push.c b/builtin-push.c index 50328f4b0..787011f92 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -158,9 +158,9 @@ static int do_push(const char *repo, int flags) error("failed to push some refs to '%s'", url[i]); if (nonfastforward) { - printf("To prevent you from losing history, non-fast-forward updates were rejected.\n" - "Merge the remote changes before pushing again.\n" - "See 'non-fast forward' section of 'git push --help' for details.\n"); + printf("To prevent you from losing history, non-fast-forward updates were rejected\n" + "Merge the remote changes before pushing again. See the 'non-fast forward'\n" + "section of 'git push --help' for details.\n"); } errs++; } @@ -175,6 +175,7 @@ int cmd_push(int argc, const char **argv, const char *prefix) const char *repo = NULL; /* default repository */ struct option options[] = { + OPT_BIT('q', "quiet", &flags, "be quiet", TRANSPORT_PUSH_QUIET), OPT_BIT('v', "verbose", &flags, "be verbose", TRANSPORT_PUSH_VERBOSE), OPT_STRING( 0 , "repo", &repo, "repository", "repository"), OPT_BIT( 0 , "all", &flags, "push all refs", TRANSPORT_PUSH_ALL),