Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 6 Sep 2009 07:39:32 +0000 (00:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 6 Sep 2009 07:39:32 +0000 (00:39 -0700)
* maint:
  push: re-flow non-fast-forward message
  push: fix english in non-fast-forward message

builtin-push.c

index 67f6d96..787011f 100644 (file)
@@ -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++;
        }