From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 6 Sep 2009 07:39:32 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.5-rc0~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6ea71fe7d36cf5b81c2100d97a822ecf0bc04746?hp=-c

Merge branch 'maint'

* maint:
push: re-flow non-fast-forward message
push: fix english in non-fast-forward message
---

6ea71fe7d36cf5b81c2100d97a822ecf0bc04746
diff --combined builtin-push.c
index 67f6d96fbe,f8376cffa4..787011f928
--- a/builtin-push.c
+++ b/builtin-push.c
@@@ -158,9 -158,9 +158,9 @@@ static int do_push(const char *repo, in
  
  		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,7 -175,6 +175,7 @@@ int cmd_push(int argc, const char **arg
  	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),